Merge branch 'acpi-scan' into acpi-pm
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 17 Jan 2013 13:10:27 +0000 (14:10 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 17 Jan 2013 13:10:27 +0000 (14:10 +0100)
commit6a8dd80821c215bc49bf6b108e85c1738c82bf43
tree3c8a42ca07fd69f9e11e0093e9eb041cad82c1c6
parent9931faca02c604c22335f5a935a501bb2ace6e20
parent5993c4670ea2453ef5abb45b312f150e994e6eb9
Merge branch 'acpi-scan' into acpi-pm

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