From: Len Brown <len.brown@intel.com>
Date: Sun, 5 Apr 2009 05:45:50 +0000 (-0400)
Subject: Merge branch 'acpi-modparam' into release
X-Git-Tag: v2.6.30-rc1~199^2~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=edd84690d15e4cb144cc60b754d4eaf8fac0a711;p=pandora-kernel.git

Merge branch 'acpi-modparam' into release

Conflicts:
	drivers/acpi/Makefile

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

edd84690d15e4cb144cc60b754d4eaf8fac0a711
Reading git-diff-tree failed