Merge branch 'acpi-pm' into acpi-cleanup
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 29 Jan 2013 12:56:05 +0000 (13:56 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 29 Jan 2013 12:56:05 +0000 (13:56 +0100)
commit8a78cf70fae587b0691b4b982bc69c1261e05e76
treec2b3aa89d4b64c7207250fb9ddff8fc5d717d486
parent09212fddc8661e67a964d91a6584209784f52500
parent65ab96f60621c4da8f1b4087a57b788bc4d8f27b
Merge branch 'acpi-pm' into acpi-cleanup

The following commits depend on the 'acpi-pm' material.
drivers/acpi/scan.c
include/acpi/acpi_bus.h