tree 2f0f0ff70241ae8c9dc0c07c3369c0bf96956b14
parent 53de5356be3ac62c22ae1da266943059b169d9b1
parent 90c53ca426cb93d15eefea79dcf6bd15ad3ffeb4
author Len Brown <len.brown@intel.com> 1253341899 -0400
committer Len Brown <len.brown@intel.com> 1253341899 -0400

Merge branch 'video' into release

Conflicts:
	drivers/acpi/video.c

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