diff options
author | 2013-12-18 14:03:38 -0700 | |
---|---|---|
committer | 2013-12-18 14:03:38 -0700 | |
commit | 330ebfe36e3dc21f656dfa59d69895e21bf6e9da (patch) | |
tree | 7eb064b76d37df212c27506798e7269acd14c327 /tools/perf/scripts/python/call-graph-from-postgresql.py | |
parent | Merge branch 'pci/aer' into next (diff) | |
parent | PCI: Remove from bus_list and release resources in pci_release_dev() (diff) | |
download | linux-dev-330ebfe36e3dc21f656dfa59d69895e21bf6e9da.tar.xz linux-dev-330ebfe36e3dc21f656dfa59d69895e21bf6e9da.zip |
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
Diffstat (limited to 'tools/perf/scripts/python/call-graph-from-postgresql.py')
0 files changed, 0 insertions, 0 deletions