Merge branch 'video' into release
authorLen Brown <len.brown@intel.com>
Wed, 12 Nov 2008 02:15:50 +0000 (21:15 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 12 Nov 2008 02:15:50 +0000 (21:15 -0500)
Conflicts:
Documentation/kernel-parameters.txt

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

Trivial merge