From: Peter Maydell <peter.maydell@linaro.org>
Date: Wed, 19 Mar 2014 23:34:42 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/afaerber/tags/prep-for-2.0' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=06c1bee85a7def8d0139ee6829728a891efe623f;p=qemu.git

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

PReP machine and devices

* Raven PCI host bridge memory fixes (remainder)

# gpg: Signature made Wed 19 Mar 2014 23:35:08 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/prep-for-2.0:
  raven: Use raven_ for all function prefixes
  raven: Fix PCI bus accesses with size > 1
  raven: Add PCI bus mastering address space
  raven: Set a correct PCI memory region
  raven: Set a correct PCI I/O memory region
  raven: Implement non-contiguous I/O region
  raven: Rename intack region to pci_intack

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

06c1bee85a7def8d0139ee6829728a891efe623f