tree 46540d251f4f1c1e44af8d5ce339b37e0045ffe0
parent 726246d2e6d0ed53ac22b6fec50d1345f25e6730
parent 050134864c1c76f49eb86c134a0e02fb3c196382
author Bjorn Helgaas <bhelgaas@google.com> 1371253666 -0600
committer Bjorn Helgaas <bhelgaas@google.com> 1371253666 -0600

Merge branch 'pci/jiang-bus-lock-v3' into next

* pci/jiang-bus-lock-v3:
  PCI: Return early on allocation failures to unindent mainline code
  PCI: Simplify IOV implementation and fix reference count races
  PCI: Drop redundant setting of bus->is_added in virtfn_add_bus()
  unicore32/PCI: Remove redundant call of pci_bus_add_devices()
  m68k/PCI: Remove redundant call of pci_bus_add_devices()
  PCI: Rename pci_release_bus_bridge_dev() to pci_release_host_bridge_dev()
  PCI: Fix refcount issue in pci_create_root_bus() error recovery path
  ia64/PCI: Clean up pci_scan_root_bus() usage
  PCI: Convert alloc_pci_dev(void) to pci_alloc_dev(bus)
  PCI: Introduce pci_alloc_dev(struct pci_bus*) to replace alloc_pci_dev()
  PCI: Introduce pci_bus_{get|put}() to manage PCI bus reference count

Conflicts:
	drivers/pci/probe.c