From: Len Brown <len.brown@intel.com>
Date: Sat, 19 Sep 2009 06:31:39 +0000 (-0400)
Subject: Merge branch 'video' into release
X-Git-Tag: v2.6.32-rc1~171^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=193a6dec1c0246a80b6d0101e4f351ccf877bcac;p=pandora-kernel.git

Merge branch 'video' into release

Conflicts:
	drivers/acpi/video.c

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

193a6dec1c0246a80b6d0101e4f351ccf877bcac
Reading git-diff-tree failed