Skip to content
Commit 26b6f223 authored by Len Brown's avatar Len Brown
Browse files

Merge branches 'release' and 'menlo' into release 



Conflicts:

	drivers/acpi/video.c

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parents e5e54bc8 e5e54bc8 3c602840
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment