Merge branches 'acpica', 'acpi-battery' and 'pm-cpuidle'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 30 Apr 2015 19:05:57 +0000 (21:05 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 30 Apr 2015 19:05:57 +0000 (21:05 +0200)

Trivial merge