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

..

host

Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2013-09-06 13:30:06 -07:00

hotplug

Merge branch 'acpi-hotplug'

2013-11-07 19:31:15 +01:00

pcie

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

2013-09-03 16:24:35 -07:00

access.c

PCI: Remove pcie_cap_has_devctl()

2013-08-28 20:51:39 -06:00

ats.c

…

bus.c

PCI: Delay enabling bridges until they're needed

2013-07-25 12:35:03 -06:00

host-bridge.c

PCI: add host bridge release support

2012-04-30 14:52:43 -06:00

hotplug-pci.c

PCI: hotplug: remove pci_do_scan_bus()

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

htirq.c

…

ioapic.c

PCI: Convert ioapic.c to module_pci_driver

2013-05-27 17:05:28 -06:00

iov.c

PCI: Return -ENOSYS for SR-IOV operations on non-SR-IOV devices

2013-07-31 16:47:56 -06:00

irq.c

PCI: Convert dev_printk(KERN_<LEVEL> to dev_<level>(

2012-11-07 15:24:18 -07:00

Kconfig

PCI: remove ARCH_SUPPORTS_MSI kconfig option

2013-08-12 15:26:48 +00:00

Makefile

pci: PCIe driver for Marvell Armada 370/XP systems

2013-05-20 19:18:44 +00:00

msi.c

Remove GENERIC_HARDIRQ config option

2013-09-13 15:09:52 +02:00

of.c

…

pci-acpi.c

pci-acpi: convert acpi_get_handle() to acpi_has_method()

2013-09-24 01:37:55 +02:00

pci-driver.c

PCI: Add pcibios_pm_ops for optional arch-specific hibernate functionality

2013-08-22 14:11:32 -06:00

pci-label.c

…

pci-stub.c

PCI: Convert dev_printk(KERN_<LEVEL> to dev_<level>(

2012-11-07 15:24:18 -07:00

pci-sysfs.c

PCI: Convert class code to use dev_groups

2013-07-25 12:18:42 -06:00

pci.c

PCI: Workaround missing pci_set_master in pci drivers

2013-09-28 13:25:30 -07:00

pci.h

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2013-09-05 14:54:29 -07:00

probe.c

Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2013-09-06 13:30:06 -07:00

proc.c

pci/proc: switch to fixed_size_llseek()

2013-06-29 12:57:48 +04:00

quirks.c

Merge branch 'pci/vipul-chelsio-reset-v2' into next

2013-08-12 15:07:03 -06:00

remove.c

PCI: Add pcibios hooks for adding and removing PCI buses

2013-04-12 15:38:25 -06:00

rom.c

PCI: Add PCI ROM helper for platform-provided ROM images

2013-03-26 17:19:41 -06:00

search.c

PCI: Fix reference count leak in pci_dev_present()

2013-01-25 13:49:27 -07:00

setup-bus.c

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

2013-09-03 16:24:35 -07:00

setup-irq.c

PCI: Provide a default pcibios_update_irq()

2012-09-18 17:28:21 -06:00

setup-res.c

PCI: Remove unused variables

2013-04-15 10:56:27 -06:00

slot.c

PCI: Warn about failures instead of "must_check" functions

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

syscall.c

…

vpd.c

…

xen-pcifront.c

xen/pcifront: Deal with toolstack missing 'XenbusStateClosing' state.

2013-06-14 12:28:59 -04:00