summary refs log tree commit diff stats
path: root/hw/timer/grlib_gptimer.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-03-13 21:27:54 +0000
committerPeter Maydell <peter.maydell@linaro.org>2014-03-13 21:27:54 +0000
commit90c5d39cb847d7f360454950be647cd83cacea58 (patch)
tree21da57b090155a6a3398a6da3d0b78e7f441e380 /hw/timer/grlib_gptimer.c
parent8bf0975902bb23aea98da91e3a102bae3e1d94a6 (diff)
parent7effdaa32198b7077c51e29621dfca3d1b14e420 (diff)
downloadfocaccia-qemu-90c5d39cb847d7f360454950be647cd83cacea58.tar.gz
focaccia-qemu-90c5d39cb847d7f360454950be647cd83cacea58.zip
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>
Diffstat (limited to 'hw/timer/grlib_gptimer.c')
0 files changed, 0 insertions, 0 deletions