]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'remotes/mcayland/qemu-sparc' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 18 Aug 2014 11:55:02 +0000 (12:55 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 18 Aug 2014 11:55:02 +0000 (12:55 +0100)
* remotes/mcayland/qemu-sparc:
  target-sparc64: implement Short Floating-Point Store Instructions
  apb: add IOMMU flush register implementation
  sun4u: switch second PCI-ebus bridge BAR over to PCI IO space

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

Trivial merge