From: Len Brown <len.brown@intel.com>
Date: Fri, 30 Mar 2012 20:12:23 +0000 (-0400)
Subject: Merge branch 'apei' into release
X-Git-Tag: v3.4-rc1~18^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73f05330497b98c45d157b7d0c60673798bb4c3b;p=pandora-kernel.git

Merge branch 'apei' into release

Conflicts:
	drivers/acpi/apei/apei-base.c

This was a conflict between

15afae604651d4e17652d2ffb56f5e36f991cfef
(CPI, APEI: Fix incorrect APEI register bit width check and usage)

and

653f4b538f66d37db560e0f56af08117136d29b7
(ACPICA: Expand OSL memory read/write interfaces to 64 bits)

The former changed a parameter in the call to acpi_os_read_memory64()
and the later replaced all calls to acpi_os_read_memory64()
with calls to acpi_os_read_memory().

Signed-off-by: Len Brown <len.brown@intel.com>
---

73f05330497b98c45d157b7d0c60673798bb4c3b
Reading git-diff-tree failed