From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 16 May 2014 14:33:32 +0000 (+0200)
Subject: Merge branch 'acpi-proc' into acpi-battery
X-Git-Tag: v3.16-rc1~30^2~5^2~12^2~5
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=054c1c45395175ad057487d456668b83d51856ec;p=linux.git

Merge branch 'acpi-proc' into acpi-battery
---

054c1c45395175ad057487d456668b83d51856ec