Merge branch 'bugzilla-13577-video' into release
Len Brown [Wed, 20 Jan 2010 06:14:41 +0000 (01:14 -0500)]
1  2 
drivers/acpi/video.c

Simple merge