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)
The following commits depend on the 'acpi-pm' material.

1  2 
drivers/acpi/scan.c
include/acpi/acpi_bus.h

Simple merge
Simple merge