tree 9ef0331d6c207b54502906c239b40220e8113502
parent 2c0d4fe0189ae5e29fd9602d5b83f3b2b169bd1b
parent c511cc1990bbc263c3f8a2ef4d7d613a3b40ffe2
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1359464314 +0100
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1359464314 +0100

Merge branch 'acpi-scan' into acpi-cleanup

The following commits depend on the 'acpi-scan' material.