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)
commit054c1c45395175ad057487d456668b83d51856ec
tree084a32b1e5eb05014663a0f767e0b5a1426d8810
parentd6d211db37e75de2ddc3a4f979038c40df7cc79c
parent3afcb96fee9ba33ce838f2ceaa248358cffe2f56
Merge branch 'acpi-proc' into acpi-battery