Commit 40193cb7 authored by Anibal Limon's avatar Anibal Limon
Browse files

Merge tag 'v4.14.82' into release/qcomlt-4.14 

This is the 4.14.82 stable release

Conflicts:
	drivers/cpufreq/cpufreq-dt.c
	drivers/media/platform/qcom/camss/camss-csid.c
parents 64c00cd3 a21f3c11
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