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)
commitd78c0d2e460efcd924f9a219d3ffc072624e1a68
tree1498db9a9349879628b27316fe296e4ed9a9b650
parent26fb95cac56be1885787cfc69881d906f4814c46
parent0bde84f40232e0f81bb9fa79d7953fed4a32811c
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
net/wireless/nl80211.c