summary refs log tree commit diff stats
path: root/ui/console.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-04-08 10:51:45 +0100
committerPeter Maydell <peter.maydell@linaro.org>2016-04-08 10:51:45 +0100
commit5542417dae2aaa5755ccfaddba4a481c5277e97c (patch)
tree50f828ad5af64ce684b1ecf981f6bd03e399500d /ui/console.c
parent28ee01269e910c68fb75ff780c9d84e0c34e0d66 (diff)
parent3ccdbecf80a322a31dbf452d433321c67f82d534 (diff)
downloadfocaccia-qemu-5542417dae2aaa5755ccfaddba4a481c5277e97c.tar.gz
focaccia-qemu-5542417dae2aaa5755ccfaddba4a481c5277e97c.zip
Merge remote-tracking branch 'remotes/weil/tags/pull-tci-20160407' into staging
tci patch queue

# gpg: Signature made Thu 07 Apr 2016 18:01:55 BST using RSA key ID 677450AD
# gpg: Good signature from "Stefan Weil <sw@weilnetz.de>"
# gpg:                 aka "Stefan Weil <stefan.weil@weilnetz.de>"
# gpg:                 aka "Stefan Weil <stefan.weil@bib.uni-mannheim.de>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4923 6FEA 75C9 5D69 8EC2  B78A E08C 21D5 6774 50AD

* remotes/weil/tags/pull-tci-20160407:
  tci: Fix build regression

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/console.c')
0 files changed, 0 insertions, 0 deletions