tree d707b2863494452585941d3818347005f34c636e
parent c4e050376c69bb9d67895842665264df2a2004d9
parent b88ce2a41562d1a9554f209e0f31a32d9f473794
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1354020162 +0100
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1354020162 +0100

Merge branch 'acpi-dev-pm' into acpi-enumeration

Subsequent commits in this branch will depend on 'acpi-dev-pm'
material.