summary refs log tree commit diff stats
path: root/hw/usb/dev-serial.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-09-15 16:42:28 +0100
committerPeter Maydell <peter.maydell@linaro.org>2014-09-15 16:42:28 +0100
commit16ab5046c4a607dddabc8086d4454293af59fc9f (patch)
tree259ad0bd7fb8bf2e881e38f67b9f23555b7cce0e /hw/usb/dev-serial.c
parent2b31cd4e081389ec1688f58af27f9759bf221c1d (diff)
parent236f282c1c7bb41b0ec3b3d771ca652eb85ed81f (diff)
downloadfocaccia-qemu-16ab5046c4a607dddabc8086d4454293af59fc9f.tar.gz
focaccia-qemu-16ab5046c4a607dddabc8086d4454293af59fc9f.zip
Merge remote-tracking branch 'remotes/kraxel/tags/pull-console-20140915-1' into staging
Fix pixman build failure.

# gpg: Signature made Mon 15 Sep 2014 07:15:11 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/kraxel/tags/pull-console-20140915-1:
  configure: check for pixman-1 version
  pixman: update internal copy to pixman-0.32.6

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