From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 18 Dec 2013 21:03:38 +0000 (-0700)
Subject: Merge branch 'pci/deletion' into next
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=330ebfe36e3dc21f656dfa59d69895e21bf6e9da;p=deliverable%2Flinux.git

Merge branch 'pci/deletion' into next

* pci/deletion:
  PCI: Remove from bus_list and release resources in pci_release_dev()
  PCI: Move pci_proc_attach_device() to pci_bus_add_device()
  PCI: Use device_release_driver() in pci_stop_root_bus()
  PCI: Move device_del() from pci_stop_dev() to pci_destroy_dev()

Conflicts:
	drivers/pci/remove.c
---

330ebfe36e3dc21f656dfa59d69895e21bf6e9da