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)

Trivial merge