From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Sat, 15 Feb 2014 23:21:24 +0000 (+0100)
Subject: Merge back earlier 'acpi-dock' material.
X-Git-Tag: v3.15-rc1~151^2~13^2~15
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6a40224a30687f6e0471c4476e3a1a9adc28a96;p=pandora-kernel.git

Merge back earlier 'acpi-dock' material.
---

d6a40224a30687f6e0471c4476e3a1a9adc28a96