Merge branch 'acpi-scan' into acpi-cleanup
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 25 Jan 2013 23:36:44 +0000 (00:36 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 25 Jan 2013 23:36:44 +0000 (00:36 +0100)
commitcc38e519132f62d52db0a04d2eaed0d7c52fb165
tree35baaba355d6fbc1d43e9ca12278156f3eeab910
parent949db153b6466c6f7cad5a427ecea94985927311
parentb8bd759acd05281abf88cddef30c57313c109697
Merge branch 'acpi-scan' into acpi-cleanup

The following commits depend on the 'acpi-scan' material.
drivers/acpi/acpi_memhotplug.c
drivers/acpi/device_pm.c
drivers/acpi/glue.c
drivers/acpi/scan.c