Skip to content
Commit 478c6a43 authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'linus' into release 



Conflicts:
	arch/x86/kernel/cpu/cpufreq/longhaul.c

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