| commit | 330ebfe36e3dc21f656dfa59d69895e21bf6e9da | [log] [tgz] |
|---|---|---|
| author | Bjorn Helgaas <bhelgaas@google.com> | Wed Dec 18 14:03:38 2013 -0700 |
| committer | Bjorn Helgaas <bhelgaas@google.com> | Wed Dec 18 14:03:38 2013 -0700 |
| tree | 7eb064b76d37df212c27506798e7269acd14c327 | |
| parent | d9cdfb8705b5b40087a437c3a58cf9dff59a0a46 [diff] | |
| parent | ef83b0781a73f9efcb1228256bfdfb97fc9533a8 [diff] |
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