Merge branch 'video' into release
authorLen Brown <len.brown@intel.com>
Sat, 19 Sep 2009 06:31:39 +0000 (02:31 -0400)
committerLen Brown <len.brown@intel.com>
Sat, 19 Sep 2009 06:31:39 +0000 (02:31 -0400)
Conflicts:
drivers/acpi/video.c

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

Trivial merge