From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 27 May 2014 16:11:38 +0000 (+0200)
Subject: Merge back earlier ACPICA material.
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~39^2~5^2~6^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9b77a4070a60762aee048e3c353d72fb990f940;p=pandora-kernel.git

Merge back earlier ACPICA material.

Conflicts:
	drivers/acpi/acpica/acglobal.h
---

c9b77a4070a60762aee048e3c353d72fb990f940
Reading git-diff-tree failed