summaryrefslogtreecommitdiffstats
path: root/drivers/video/sticore.h
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2014-01-15 10:53:23 -0700
committerBjorn Helgaas <bhelgaas@google.com>2014-01-15 10:53:23 -0700
commit40304618468cae5259f77c15511e4feb7bfb624b (patch)
tree19666e52586c98484a3bf8f1b19c28103feb9006 /drivers/video/sticore.h
parent1255dfbb0c77c7a26fec10a5c101b075c3641965 (diff)
parent8a4c5c329de716996eea03d93753ccbb5406072b (diff)
downloadlinux-40304618468cae5259f77c15511e4feb7bfb624b.tar.bz2
Merge branch 'pci/locking' into next
* pci/locking: PCI: Check parent kobject in pci_destroy_dev() xen/pcifront: Use global PCI rescan-remove locking powerpc/eeh: Use global PCI rescan-remove locking MPT / PCI: Use pci_stop_and_remove_bus_device_locked() platform / x86: Use global PCI rescan-remove locking PCI: hotplug: Use global PCI rescan-remove locking pcmcia: Use global PCI rescan-remove locking ACPI / hotplug / PCI: Use global PCI rescan-remove locking ACPI / PCI: Use global PCI rescan-remove locking in PCI root hotplug PCI: Add global pci_lock_rescan_remove()
Diffstat (limited to 'drivers/video/sticore.h')
0 files changed, 0 insertions, 0 deletions