From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 14 Feb 2014 21:37:09 +0000 (-0700)
Subject: Merge branch 'pci/scan-bridge' into next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=25a712a49fade142b78a1c55166ad8a19cb53aba;p=linux-beck.git

Merge branch 'pci/scan-bridge' into next

* pci/scan-bridge:
  PCI: Don't scan random busses in pci_scan_bridge()
  PCI: Check for child busses which use more bus numbers than allocated
  PCI: Remove pci_fixup_parent_subordinate_busnr()
  PCI: Make sure bus number resources stay within their parents bounds
  PCI: Use request_resource_conflict() instead of insert_ for bus numbers
  PCI: Assign CardBus bus number only during the second pass
  PCI: Clarify the "scan anyway" comment in pci_scan_bridge()
  PCI: Increment max correctly in pci_scan_bridge()
---

25a712a49fade142b78a1c55166ad8a19cb53aba