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

PCI: hotplug: ensure a consistent return value in error case

2012-07-16 09:25:56 -06:00

cpci_hotplug_pci.c

PCI: cpcihp: Iterate over all devices in slot, not functions 0-7

2013-01-25 09:23:08 -07:00

cpci_hotplug.h

PCI: Remove "extern" from function declarations

2013-04-17 10:21:17 -06:00

cpcihp_generic.c

PCI/cpcihp: Use hotplug-safe pci_get_domain_bus_and_slot()

2012-09-12 14:13:59 -06:00

cpcihp_zt5550.c

PCI: Remove __dev* markings

2012-11-28 13:16:47 -08:00

cpcihp_zt5550.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

cpqphp_core.c

PCI: hotplug: ensure a consistent return value in error case

2012-07-16 09:25:56 -06:00

cpqphp_ctrl.c

PCI: cpqphp: Cleanup and remove unreachable paths

2013-01-07 11:34:04 -07:00

cpqphp_nvram.c

PCI Hotplug: cpqphp: fix comment style

2009-06-11 12:04:08 -07:00

cpqphp_nvram.h

PCI: Remove "extern" from function declarations

2013-04-17 10:21:17 -06:00

cpqphp_pci.c

PCI: cpqhp: use generic pci_hp_add_bridge()

2012-06-13 15:42:26 -06:00

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

Merge tag 'for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

2012-07-24 16:17:07 -07:00

ibmphp_ebda.c

pci: hotplug: Fix typo in pci

2012-07-24 12:59:30 +02:00

ibmphp_hpc.c

PCI hotplug: ibmphp-hpc: semaphore cleanup

2010-10-15 13:09:48 -07:00

ibmphp_pci.c

pci: hotplug: Fix typo in pci

2012-07-24 12:59:30 +02:00

ibmphp_res.c

ibmphp: Rename add_range() to add_bus_range() to avoid conflict

2010-02-10 17:45:09 -08:00

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

s390/pci: PCI hotplug support via SCLP

2012-11-30 17:47:25 +01:00

pci_hotplug_core.c

PCI: Remove __must_check from definitions

2013-04-17 10:20:58 -06:00

pciehp_acpi.c

PCI: Use PCI_EXP_SLTCAP_PSN mask when extracting slot number

2013-04-15 14:30:44 -06:00

pciehp_core.c

PCI: pciehp: Add reset_slot() method

2013-08-14 14:55:26 -06:00

pciehp_ctrl.c

PCI: pciehp: Use per-slot workqueues to avoid deadlock

2013-01-12 13:56:33 -07:00

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

PCI: hotplug: ensure a consistent return value in error case

2012-07-16 09:25:56 -06:00

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

PCI: introduce pci_slot

2008-06-10 14:37:03 -07:00

rpadlpar.h

PCI: Remove "extern" from function declarations

2013-04-17 10:21:17 -06:00

rpaphp_core.c

module_param: make bool parameters really bool (drivers & misc)

2012-01-13 09:32:20 +10:30

rpaphp_pci.c

PCI hotplug: rpaphp: make debug var unique

2008-10-20 10:54:27 -07:00

rpaphp_slot.c

headers: kobject.h redux

2011-01-10 08:51:44 -08:00

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

Merge tag 'pci-v3.9-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

2013-02-25 21:18:18 -08:00

shpchp_core.c

drivers: avoid format strings in names passed to alloc_workqueue()

2013-07-03 16:07:41 -07:00

shpchp_ctrl.c

PCI: shpchp: Use per-slot workqueues to avoid deadlock

2013-01-14 10:23:22 -07:00

shpchp_hpc.c

PCI hotplug: shpchp: don't blindly claim non-AMD 0x7450 device IDs

2011-11-14 09:43:14 -08:00

shpchp_pci.c

PCI: shpchp: Iterate over all devices in slot, not functions 0-7

2013-01-25 09:23:08 -07:00

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