diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2016-05-17 21:35:46 +0200 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-05-17 21:35:46 +0200 |
commit | e257ef55ce51d7ec399193ee85acda8b8759d930 (patch) | |
tree | 45a908c6cbce2fb8ab80adcac9da3b86c3f8820c /drivers/pci/host/Kconfig | |
parent | Merge branches 'pci/hotplug' and 'pci/resource' into next (diff) | |
parent | PCI, of: Move PCI I/O space management to PCI core code (diff) | |
parent | PCI: hv: Add explicit barriers to config space access (diff) | |
download | linux-e257ef55ce51d7ec399193ee85acda8b8759d930.tar.xz linux-e257ef55ce51d7ec399193ee85acda8b8759d930.zip |
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