Merge branches 'pci/arm64' and 'pci/host-hv' into next
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 17 May 2016 19:35:46 +0000 (14:35 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 17 May 2016 19:35:46 +0000 (14:35 -0500)
commite257ef55ce51d7ec399193ee85acda8b8759d930
tree45a908c6cbce2fb8ab80adcac9da3b86c3f8820c
parent45604e68ed7acf23e6c4cbac9930c61df19220c8
parentc5076cfe768998e9d395bc8486b29b18b0f99fd9
parentbdd74440d9e887b1fa648eefa17421def5f5243c
Merge branches 'pci/arm64' and 'pci/host-hv' into next

* pci/arm64:
  PCI, of: Move PCI I/O space management to PCI core code
  PCI: generic, thunder: Use generic ECAM API
  PCI: Provide common functions for ECAM mapping

* pci/host-hv:
  PCI: hv: Add explicit barriers to config space access
drivers/pci/host/Kconfig
drivers/pci/host/pci-thunder-pem.c
drivers/pci/pci.c
include/linux/pci.h