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

Merge branches 'release' and 'video' into release

Conflicts:

	include/acpi/acpi_bus.h

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

52b097fff89b14c0b8b7a7deef1d274889b1886d
Reading git-diff-tree failed