Merge branch 'pci/deletion' into next

Browse source

* 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

...

This commit is contained in:

Bjorn Helgaas 2013-12-18 14:03:38 -07:00

parent d9cdfb8705 ef83b0781a

commit 330ebfe36e

3 changed files with 22 additions and 25 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

drivers/pci/bus.c

View file

23

drivers/pci/probe.c

View file

23

drivers/pci/remove.c

View file