Merge branch 'for-linville' of git://github.com/kvalo/ath
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 16 May 2014 18:15:28 +0000 (14:15 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 16 May 2014 18:15:28 +0000 (14:15 -0400)
commit75e58071c0c64f331ccc4c0037990a1e50099f7f
tree3074ad8e4be3762cae1e1f5d11d103ce8c216329
parent5f407acbb7d6a92841c455b37a6ad4833757740e
parentd9bc4b9b693d52dc14dc1de5dfec760634067d8c
Merge branch 'for-linville' of git://github.com/kvalo/ath
drivers/net/wireless/ath/ath10k/mac.c