From: Len Brown <len.brown@intel.com>
Date: Tue, 26 Oct 2010 18:50:56 +0000 (-0400)
Subject: Merge branch 'acpi-mmio' into release
X-Git-Tag: v2.6.37-rc1~100^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1bd64d42abdd4f9d44f77011a31f0292112f4c3b;p=pandora-kernel.git

Merge branch 'acpi-mmio' into release

Conflicts:
	drivers/acpi/osl.c

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

1bd64d42abdd4f9d44f77011a31f0292112f4c3b
Reading git-diff-tree failed