From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 15 Sep 2014 15:42:28 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-console-20140915-1' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=16ab5046c4a607dddabc8086d4454293af59fc9f;p=qemu.git

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>
---

16ab5046c4a607dddabc8086d4454293af59fc9f