twx-linux/drivers/pci/hotplug
Rafael J. Wysocki 63ff4d0765 Merge branch 'acpi-hotplug'
* acpi-hotplug:
  ACPI / hotplug: Consolidate deferred execution of ACPI hotplug routines
  ACPI / hotplug: Do not execute "insert in progress" _OST
  ACPI / hotplug: Carry out PCI root eject directly
  ACPI / hotplug: Merge device hot-removal routines
  ACPI / hotplug: Make acpi_bus_hot_remove_device() internal
  ACPI / hotplug: Simplify device ejection routines
  ACPI / hotplug: Fix handle_root_bridge_removal()
  ACPI / hotplug: Refuse to hot-remove all objects with disabled hotplug
  ACPI / scan: Start matching drivers after trying scan handlers
  ACPI: Remove acpi_pci_slot_init() headers from internal.h

Conflicts:
	include/acpi/acpiosxf.h (with the 'acpica' branch)
2013-11-07 19:31:15 +01:00
..
acpi_pcihp.c acpi_pcihp: convert acpi_get_handle() to acpi_has_method() 2013-09-24 01:37:55 +02:00
acpiphp_core.c ACPI / hotplug / PCI: Consolidate slot disabling and ejecting 2013-07-23 04:00:25 +02:00
acpiphp_glue.c Merge branch 'acpi-hotplug' 2013-11-07 19:31:15 +01:00
acpiphp_ibm.c Merge branch 'acpi-assorted' 2013-08-27 01:29:04 +02:00
acpiphp.h ACPI / hotplug / PCI: Get rid of unused constants in acpiphp.h 2013-07-23 04:00:27 +02:00
cpci_hotplug_core.c
cpci_hotplug_pci.c
cpci_hotplug.h PCI: Remove "extern" from function declarations 2013-04-17 10:21:17 -06:00
cpcihp_generic.c
cpcihp_zt5550.c
cpcihp_zt5550.h
cpqphp_core.c
cpqphp_ctrl.c
cpqphp_nvram.c
cpqphp_nvram.h PCI: Remove "extern" from function declarations 2013-04-17 10:21:17 -06:00
cpqphp_pci.c
cpqphp_sysfs.c cpqphp_sysfs: switch to fixed_size_llseek() 2013-06-29 12:57:52 +04:00
cpqphp.h PCI: Remove "extern" from function declarations 2013-04-17 10:21:17 -06:00
ibmphp_core.c
ibmphp_ebda.c
ibmphp_hpc.c
ibmphp_pci.c
ibmphp_res.c
ibmphp.h PCI: Remove "extern" from function declarations 2013-04-17 10:21:17 -06:00
Kconfig s390/pci/hotplug: convert to be builtin only 2013-08-30 08:57:07 +02:00
Makefile
pci_hotplug_core.c PCI: Remove __must_check from definitions 2013-04-17 10:20:58 -06:00
pciehp_acpi.c
pciehp_core.c PCI: pciehp: Add reset_slot() method 2013-08-14 14:55:26 -06:00
pciehp_ctrl.c
pciehp_hpc.c PCI: pciehp: Add reset_slot() method 2013-08-14 14:55:26 -06:00
pciehp_pci.c PCI: pciehp: Fix null pointer deref when hot-removing SR-IOV device 2013-07-25 14:11:06 -06:00
pciehp.h PCI: pciehp: Add reset_slot() method 2013-08-14 14:55:26 -06:00
pcihp_skeleton.c
pcihp_slot.c PCI: Simplify pcie_bus_configure_settings() interface 2013-08-22 10:47:02 -06:00
rpadlpar_core.c powerpc/pci/hotplug: Don't need to remove from EEH cache twice 2013-07-24 14:18:47 +10:00
rpadlpar_sysfs.c
rpadlpar.h PCI: Remove "extern" from function declarations 2013-04-17 10:21:17 -06:00
rpaphp_core.c
rpaphp_pci.c
rpaphp_slot.c
rpaphp.h PCI: Remove "extern" from function declarations 2013-04-17 10:21:17 -06:00
s390_pci_hpc.c s390/pci: add recover sysfs knob 2013-08-30 08:57:12 +02:00
sgi_hotplug.c
shpchp_core.c drivers: avoid format strings in names passed to alloc_workqueue() 2013-07-03 16:07:41 -07:00
shpchp_ctrl.c
shpchp_hpc.c
shpchp_pci.c
shpchp_sysfs.c PCI: Remove __must_check from definitions 2013-04-17 10:20:58 -06:00
shpchp.h PCI: Remove "extern" from function declarations 2013-04-17 10:21:17 -06:00