Merge branch 'video' into release
commit193a6dec1c0246a80b6d0101e4f351ccf877bcac
authorLen Brown <len.brown@intel.com>
Sat, 19 Sep 2009 06:31:39 +0000 (19 02:31 -0400)
committerLen Brown <len.brown@intel.com>
Sat, 19 Sep 2009 06:31:39 +0000 (19 02:31 -0400)
tree2f0f0ff70241ae8c9dc0c07c3369c0bf96956b14
parent53de5356be3ac62c22ae1da266943059b169d9b1
parent90c53ca426cb93d15eefea79dcf6bd15ad3ffeb4
Merge branch 'video' into release

Conflicts:
drivers/acpi/video.c

Signed-off-by: Len Brown <len.brown@intel.com>
drivers/acpi/video.c