From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 13 Mar 2014 21:27:54 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/afaerber/tags/ppc-for-2.0' into staging
X-Git-Tag: v2.0.0-rc0~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=90c5d39cb847d7f360454950be647cd83cacea58;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'remotes/afaerber/tags/ppc-for-2.0' into staging

PowerPC queue for 2.0

* Fixes for -device VGA

# gpg: Signature made Thu 13 Mar 2014 19:57:12 GMT using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
# gpg:                 aka "Andreas Färber <afaerber@suse.com>"

* remotes/afaerber/tags/ppc-for-2.0:
  spapr: Fix return value of vga initialization
  Fix vga_interface_type for command line argument '-device VGA'

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

90c5d39cb847d7f360454950be647cd83cacea58