From: Len Brown <len.brown@intel.com>
Date: Wed, 12 Nov 2008 02:15:50 +0000 (-0500)
Subject: Merge branch 'video' into release
X-Git-Tag: v2.6.28-rc5~77^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f398778aa336a2919ee04ba45d915007230c6957;p=pandora-kernel.git

Merge branch 'video' into release

Conflicts:
	Documentation/kernel-parameters.txt

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

f398778aa336a2919ee04ba45d915007230c6957
Reading git-diff-tree failed