OSDN Git Service

Merge branch 'acpi-scan' into acpi-lpss
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 18 Jan 2013 12:48:30 +0000 (13:48 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 18 Jan 2013 12:48:30 +0000 (13:48 +0100)
commit0b3571274b8ff53c0e08bc667ecd3d8a43bd8714
tree57fa58c4c5abe63cccf3fd842548d16fc8d792ba
parent7d1f9aeff1ee4a20b1aeb377dd0f579fe9647619
parent5993c4670ea2453ef5abb45b312f150e994e6eb9
Merge branch 'acpi-scan' into acpi-lpss

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