From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 18 Mar 2014 00:53:28 +0000 (+0100)
Subject: Merge branch 'acpi-config' into acpica
X-Git-Tag: v3.15-rc1~151^2~7^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bcef50814c9de8e0672d3e7f9f1abd85e1b95d13;p=pandora-kernel.git

Merge branch 'acpi-config' into acpica

Conflicts:
	include/acpi/platform/aclinux.h
---

bcef50814c9de8e0672d3e7f9f1abd85e1b95d13
Reading git-diff-tree failed