diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2016-05-17 14:35:46 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-05-17 14:35:46 -0500 |
| commit | e257ef55ce51d7ec399193ee85acda8b8759d930 (patch) | |
| tree | 45a908c6cbce2fb8ab80adcac9da3b86c3f8820c /arch/arm/boot/dts/imx6q-apalis-ixora.dts | |
| parent | 45604e68ed7acf23e6c4cbac9930c61df19220c8 (diff) | |
| parent | c5076cfe768998e9d395bc8486b29b18b0f99fd9 (diff) | |
| parent | bdd74440d9e887b1fa648eefa17421def5f5243c (diff) | |
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