diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-07-01 14:33:41 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-07-01 14:34:26 +0800 |
| commit | 439863d92fda525a8f3b326a24490e91c70f0496 (patch) | |
| tree | ec25b3ae200d75f2be939a7da5305537dd9172f9 /net/llc/af_llc.c | |
| parent | 43c981bd2d8af8d91726be1fac389cdce47dce1e (diff) | |
| parent | 95123c0b81d9478b8155fe15093b88f57ef7d0bd (diff) | |
Merge remote-tracking branch 'lts/linux-4.1.y' into linux-linaro-lsk-v4.1lsk-v4.1-16.06
Conflicts:
adopt s/cpufreq_val/cpufreq_freqs in drivers/thermal/cpu_cooling.c
Diffstat (limited to 'net/llc/af_llc.c')
0 files changed, 0 insertions, 0 deletions