Skip to content
Commit 57599cc9 authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'bjorn-notify' into release 



Conflicts:
	drivers/platform/x86/eeepc-laptop.c

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parents fbe8cddd 586caae3
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