commit | 5e2e46e84b6f77d4f8e51d6e33ff8eb0f47288f2 | [log] [tgz] |
---|---|---|
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Thu Feb 20 21:42:03 2014 +0100 |
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Thu Feb 20 21:42:03 2014 +0100 |
tree | e7b40c95f8216156a9d169aecd8759ccd6da0009 | |
parent | 6d0abeca3242a88cab8232e4acd7e2bf088f3bc2 [diff] | |
parent | fae9e2a4b1c59d11edfa7c99c34293bf9fbf2bde [diff] |
Merge branch 'acpi-pm' into acpi-fan