Merge tag 'pci-v4.13-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Jul 2017 19:36:20 +0000 (12:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Jul 2017 19:36:20 +0000 (12:36 -0700)
commit2931dc7d9daf7addc10a126aedf1e630a1a05b49
treeca97c5e0e9baf5eeec81e8b555339b9cbeade532
parentd3c329c741af0a7bc338900491dfbb10422f5618
parent34d5ac2af644a10958e144b7bb937d289dfd158d
Merge tag 'pci-v4.13-fixes-1' of git://git./linux/kernel/git/helgaas/pci

Pull PCI fixes from Bjorn Helgaas:

 - fix a typo that broke Rockchip enumeration

 - fix a new memory leak in the ARM host bridge failure path

* tag 'pci-v4.13-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI: rockchip: Check for pci_scan_root_bus_bridge() failure correctly
  ARM/PCI: Fix pcibios_init_resource() struct pci_host_bridge leak