From: Len Brown <len.brown@intel.com>
Date: Thu, 7 Feb 2008 08:38:22 +0000 (-0500)
Subject: Merge branches 'release' and 'fluff' into release
X-Git-Tag: v2.6.25-rc1~297^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a733a5da97b238e3e3167d3d0aee8fe1e8d04e97;p=pandora-kernel.git

Merge branches 'release' and 'fluff' into release

Conflicts:

	drivers/acpi/scan.c
	include/linux/acpi.h

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

a733a5da97b238e3e3167d3d0aee8fe1e8d04e97
Reading git-diff-tree failed