tree 4cd16290c9e1350d946a92ca8d5624cdd683b739
parent 7329e9356e5b46e11a1781dff2dc64c2e3284884
parent 03ae61dd5701092aabb60a8cae9929dbf8dc25c6
author Len Brown <len.brown@intel.com> 1238910006 -0400
committer Len Brown <len.brown@intel.com> 1238910006 -0400

Merge branch 'video' into release

Conflicts:
	drivers/acpi/video.c

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