]> Pileus Git - ~andy/linux/commit
projects / ~andy / linux / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d9cdfb8 ef83b07)
Merge branch 'pci/deletion' into next
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 18 Dec 2013 21:03:38 +0000 (14:03 -0700)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 18 Dec 2013 21:03:38 +0000 (14:03 -0700)
commit330ebfe36e3dc21f656dfa59d69895e21bf6e9da
tree7eb064b76d37df212c27506798e7269acd14c327tree | snapshot
parentd9cdfb8705b5b40087a437c3a58cf9dff59a0a46commit | diff
parentef83b0781a73f9efcb1228256bfdfb97fc9533a8commit | 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
Andy's Linux Kernel repo