Merge branch 'acpi-pm' into acpi-fan
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 20 Feb 2014 20:42:03 +0000 (21:42 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 20 Feb 2014 20:42:03 +0000 (21:42 +0100)
commit5e2e46e84b6f77d4f8e51d6e33ff8eb0f47288f2
treee7b40c95f8216156a9d169aecd8759ccd6da0009
parent6d0abeca3242a88cab8232e4acd7e2bf088f3bc2
parentfae9e2a4b1c59d11edfa7c99c34293bf9fbf2bde
Merge branch 'acpi-pm' into acpi-fan