From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Wed, 14 Aug 2013 21:22:45 +0000 (+0200)
Subject: Merge back earlier 'acpi-assorted' material
X-Git-Tag: v3.12-rc1~178^2~12^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f3ce717e60572421f56d89c9a85ac42e634d16e7;p=thirdparty%2Fkernel%2Flinux.git

Merge back earlier 'acpi-assorted' material
---

f3ce717e60572421f56d89c9a85ac42e634d16e7