Commit 439863d9 authored by Alex Shi's avatar Alex Shi
Browse files

Merge remote-tracking branch 'lts/linux-4.1.y' into linux-linaro-lsk-v4.1 

 Conflicts:
	adopt s/cpufreq_val/cpufreq_freqs in drivers/thermal/cpu_cooling.c
parents 43c981bd 95123c0b
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