]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20140630' into...
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 30 Jun 2014 14:16:25 +0000 (15:16 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 30 Jun 2014 14:16:26 +0000 (15:16 +0100)
commita156dd9a223d98779da6207144d33a4dea90b683
treeb4bd7374b47ed9ce5ca1e1e0f8572f65bf597b45
parent9328cfd2fe4a7ff86a41b2c26ea33974241d7d4e
parentffebe8997523fd922da58a8e19ddffee6b035429
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20140630' into staging

target-arm:
 * provide PL031 RTC in virt board
 * fix missing pxa2xx and strongarm vmstate
 * convert cadence_ttc to instance_init
 * fix libvixl format strings and README

# gpg: Signature made Mon 30 Jun 2014 13:44:33 BST using RSA key ID 14360CDE
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"

* remotes/pmaydell/tags/pull-target-arm-20140630:
  disas/libvixl: Fix wrong format strings
  disas/libvixl: Update README for version base
  timer: cadence_ttc: Convert to instance_init
  hw/arm/pxa2xx_gpio: Correct and register vmstate
  hw/arm/pxa2xx_gpio: Fix handling of GPSR/GPCR reads
  hw/arm/strongarm: Wire up missing GPIO and PPC vmstate
  hw/arm/strongarm: Fix handling of GPSR/GPCR reads
  hw/arm/virt: Provide PL031 RTC

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