diff options
| author | Bjorn Helgaas | 2015-02-02 14:49:49 -0600 |
|---|---|---|
| committer | Bjorn Helgaas | 2015-02-02 14:49:49 -0600 |
| commit | ae03e7c46524b9402936afd9e2a5b50547ffaf78 (patch) | |
| tree | 90574c1abafb47718e8fa90cc11714ebc2297ff0 /drivers/pci | |
| parent | 2cd59deaefbc5fb88e6e232664377a02ca3122ed (diff) | |
| parent | d2be00c0fb5ae0794deffcdb0425cd5a8d823db0 (diff) | |
| parent | b7e78170efd46db039f56f76f4aa672134004c41 (diff) | |
Merge branches 'pci/host-generic' and 'pci/host-versatile' into next
* pci/host-generic:
of/pci: Free resources on failure in of_pci_get_host_bridge_resources()
* pci/host-versatile:
PCI: versatile: Add DT-based ARM Versatile PB PCIe host driver
ARM: dts: versatile: add PCI controller binding
PCI: versatile: Add DT docs for ARM Versatile PB PCIe driver