From: Len Brown <len.brown@intel.com>
Date: Sun, 5 Apr 2009 05:40:06 +0000 (-0400)
Subject: Merge branch 'video' into release
X-Git-Tag: v2.6.30-rc1~199^2~16
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12648810506eaa063dc23b66514fbb4796f34312;p=pandora-kernel.git

Merge branch 'video' into release

Conflicts:
	drivers/acpi/video.c

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

12648810506eaa063dc23b66514fbb4796f34312
Reading git-diff-tree failed