Skip to content
Commit 9a3bff23 authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'asus' into release 



Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/platform/x86/eeepc-laptop.c

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parents 173cc11a d951d4cc
Expand all 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