From: Rafael J. Wysocki Date: Fri, 16 May 2014 14:33:32 +0000 (+0200) Subject: Merge branch 'acpi-proc' into acpi-battery X-Git-Tag: firefly_0821_release~176^2~3768^2~5^2~12^2~5 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=054c1c45395175ad057487d456668b83d51856ec;p=firefly-linux-kernel-4.4.55.git Merge branch 'acpi-proc' into acpi-battery --- 054c1c45395175ad057487d456668b83d51856ec