From: Bjorn Helgaas <bhelgaas@google.com>
Date: Mon, 2 Feb 2015 20:49:49 +0000 (-0600)
Subject: Merge branches 'pci/host-generic' and 'pci/host-versatile' into next
X-Git-Tag: v4.0-rc1~144^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ae03e7c46524b9402936afd9e2a5b50547ffaf78;p=thirdparty%2Fkernel%2Fstable.git

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
---

ae03e7c46524b9402936afd9e2a5b50547ffaf78