From: Blue Swirl <blauwirbel@gmail.com>
Date: Sat, 20 Apr 2013 11:39:08 +0000 (+0000)
Subject: Merge branch 'arm-devs.next' of git://git.linaro.org/people/pmaydell/qemu-arm
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f4374c82b158b36bd40a5055bffa60796569a300;p=qemu.git

Merge branch 'arm-devs.next' of git://git.linaro.org/people/pmaydell/qemu-arm

* 'arm-devs.next' of git://git.linaro.org/people/pmaydell/qemu-arm:
  hw/versatile_pci: Drop unnecessary vpb_pci_config_addr()
  versatile_pci: Expose PCI memory space to system
  arm/realview: Fix mapping of PCI regions
  versatile_pci: Implement the PCI controller's control registers
  versatile_pci: Implement the correct PCI IRQ mapping
  versatile_pci: Put the host bridge PCI device at slot 29
  versatile_pci: Use separate PCI I/O space rather than system I/O space
  versatile_pci: Change to subclassing TYPE_PCI_HOST_BRIDGE
  versatile_pci: Update to realize and instance init functions
  versatile_pci: Expose PCI I/O region on Versatile PB
  versatile_pci: Fix hardcoded tabs
---

f4374c82b158b36bd40a5055bffa60796569a300