diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-12-06 13:01:29 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-12-06 13:01:29 +0800 |
| commit | bdcf7d8df4cfa7f99423da161019b964f7ce2520 (patch) | |
| tree | 7496c94119c57f9987703bb0a4f13997f911ddc1 /net/ipv6/esp6.c | |
| parent | a8575ee86e3ec89dde405193d61a6c0a958308cf (diff) | |
| parent | 3ba1692e7239293d7bc5a596ca9b0707f5bc07d5 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Conflicts:
keep low scan freq in android in net/wireless/scan.c
Diffstat (limited to 'net/ipv6/esp6.c')
0 files changed, 0 insertions, 0 deletions