tree c2b3aa89d4b64c7207250fb9ddff8fc5d717d486
parent 09212fddc8661e67a964d91a6584209784f52500
parent 65ab96f60621c4da8f1b4087a57b788bc4d8f27b
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1359464165 +0100
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1359464165 +0100

Merge branch 'acpi-pm' into acpi-cleanup

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