From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 30 Sep 2014 19:05:34 +0000 (+0200)
Subject: Merge branch 'acpica' into acpi-pm
X-Git-Tag: v3.18-rc1~109^2~6^2~3
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=e1253e5e3fcd61f1057ef8a39c8c64e6b82358b9;p=linux.git

Merge branch 'acpica' into acpi-pm
---

e1253e5e3fcd61f1057ef8a39c8c64e6b82358b9