Skip to content
Commit 193a6dec authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'video' into release 



Conflicts:
	drivers/acpi/video.c

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parents 53de5356 90c53ca4
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment