tree 90574c1abafb47718e8fa90cc11714ebc2297ff0
parent 2cd59deaefbc5fb88e6e232664377a02ca3122ed
parent d2be00c0fb5ae0794deffcdb0425cd5a8d823db0
parent b7e78170efd46db039f56f76f4aa672134004c41
author Bjorn Helgaas <bhelgaas@google.com> 1422910189 -0600
committer Bjorn Helgaas <bhelgaas@google.com> 1422910189 -0600

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