Pull video into release branch
authorLen Brown <len.brown@intel.com>
Wed, 10 Oct 2007 04:29:11 +0000 (00:29 -0400)
committerLen Brown <len.brown@intel.com>
Wed, 10 Oct 2007 04:29:11 +0000 (00:29 -0400)
Conflicts:

drivers/acpi/video.c

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

Trivial merge