Merge branch 'acpi-proc' into acpi-battery
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 16 May 2014 14:33:32 +0000 (16:33 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 16 May 2014 14:33:32 +0000 (16:33 +0200)

Trivial merge