Merge branch 'acpi-cleanup' into acpi-hotplug
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 7 Dec 2013 00:05:17 +0000 (01:05 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 7 Dec 2013 00:05:17 +0000 (01:05 +0100)
commit9ccad66f0171578445175ecd3bf66b35a96aaf6e
tree78c1be21493ef183de9444cf0d2bfb1e729b0698
parent8ff47aafb25cc80417118e4968d4e7ca3f46c3ee
parent8b48463f89429af408ff695244dc627e1acff4f7
Merge branch 'acpi-cleanup' into acpi-hotplug

Conflicts:
drivers/acpi/scan.c
drivers/acpi/bus.c
drivers/acpi/dock.c
drivers/acpi/osl.c
drivers/acpi/pci_root.c
drivers/acpi/scan.c
drivers/xen/xen-acpi-cpuhotplug.c
drivers/xen/xen-acpi-memhotplug.c
include/acpi/acpi_bus.h