Merge branch 'acpi-scan' into acpi-cleanup
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 29 Jan 2013 12:58:34 +0000 (13:58 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 29 Jan 2013 12:58:34 +0000 (13:58 +0100)
commit64e94e7e0ffb20ee11a596aa04fcdeefb33e000d
tree9ef0331d6c207b54502906c239b40220e8113502
parent2c0d4fe0189ae5e29fd9602d5b83f3b2b169bd1b
parentc511cc1990bbc263c3f8a2ef4d7d613a3b40ffe2
Merge branch 'acpi-scan' into acpi-cleanup

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