]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'remotes/afaerber/tags/ppc-for-2.0' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 13 Mar 2014 21:27:54 +0000 (21:27 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 13 Mar 2014 21:27:54 +0000 (21:27 +0000)
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>

Trivial merge