From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Sat, 7 Dec 2013 00:05:17 +0000 (+0100)
Subject: Merge branch 'acpi-cleanup' into acpi-hotplug
X-Git-Tag: v3.14-rc1~107^2~11^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ccad66f0171578445175ecd3bf66b35a96aaf6e;p=pandora-kernel.git

Merge branch 'acpi-cleanup' into acpi-hotplug

Conflicts:
	drivers/acpi/scan.c
---

9ccad66f0171578445175ecd3bf66b35a96aaf6e
Reading git-diff-tree failed