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

Merge branches 'release' and 'menlo' into release

Conflicts:

	drivers/acpi/video.c

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

26b6f2236615649a0ae6a0de2e9e71a2f9ffeba7
Reading git-diff-tree failed