]> rtime.felk.cvut.cz Git - linux-imx.git/commitdiff
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)
The following commits depend on the 'acpi-scan' material.

1  2 
drivers/acpi/acpi_memhotplug.c
drivers/acpi/device_pm.c
drivers/acpi/glue.c
drivers/acpi/scan.c

Simple merge
Simple merge
Simple merge
Simple merge