Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorAlex Shi <alex.shi@linaro.org>
Sat, 18 Apr 2015 05:37:44 +0000 (13:37 +0800)
committerAlex Shi <alex.shi@linaro.org>
Sat, 18 Apr 2015 05:37:44 +0000 (13:37 +0800)
1  2 
net/wireless/nl80211.c

Simple merge