]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit6d8eb57038a747a76a2f978d5ca8c05b5f3217dc
tree78c1be21493ef183de9444cf0d2bfb1e729b0698
parent09b26be5686113ab0ae8da3b550a7c8bae7d9fdb
parent0002c99315e2a8443a0f449d4f50ee70302a2506
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