Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
authorAlex Shi <alex.shi@linaro.org>
Tue, 6 Dec 2016 05:01:29 +0000 (13:01 +0800)
committerAlex Shi <alex.shi@linaro.org>
Tue, 6 Dec 2016 05:01:29 +0000 (13:01 +0800)
commitbdcf7d8df4cfa7f99423da161019b964f7ce2520
tree7496c94119c57f9987703bb0a4f13997f911ddc1
parenta8575ee86e3ec89dde405193d61a6c0a958308cf
parent3ba1692e7239293d7bc5a596ca9b0707f5bc07d5
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
net/wireless/scan.c