diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2015-08-04 20:52:29 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2015-08-04 20:52:29 -0500 |
| commit | cd66d5c3df7c96cbf75010b964b94032ceca8889 (patch) | |
| tree | 07e9cd5888d643d1b24b38886095988c06f05d19 /arch/frv | |
| parent | bc0195aad0daa2ad5b0d76cce22b167bc3435590 (diff) | |
| parent | 0f41421256afdfcadf0ae2d8bf83ecb7ff3ac49e (diff) | |
| parent | 8ef54f27f6f425fa8deedc237d99b9daf41d68d2 (diff) | |
| parent | e4a8f8ee89ed15eb7849bc064c2defe76cc085cf (diff) | |
Merge branches 'pci/host-designware', 'pci/host-xgene' and 'pci/host-xilinx' into next
* pci/host-designware:
PCI: designware: Don't complain missing *config* reg space if va_cfg0 is set
* pci/host-xgene:
PCI: xgene: Add support for a 64-bit prefetchable memory window
arm64: dts: Add APM X-Gene PCIe 64-bit prefetchable window
PCI: xgene: Drop owner assignment from platform_driver
* pci/host-xilinx:
PCI: xilinx: Check for MSI interrupt flag before handling as INTx