From: Len Brown <len.brown@intel.com>
Date: Mon, 25 Oct 2010 06:10:36 +0000 (-0400)
Subject: Merge branch 'acpica' into release
X-Git-Tag: v2.6.37-rc1~100^2~12
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=aca209e5e654951a3a90f5aaa8e04e0c470993b4;p=net-next-2.6.git

Merge branch 'acpica' into release

Conflicts:
	drivers/acpi/acpica/aclocal.h

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

aca209e5e654951a3a90f5aaa8e04e0c470993b4