Merge remote-tracking branch 'wireless-next/master' into ath-next
authorKalle Valo <kvalo@qca.qualcomm.com>
Wed, 14 May 2014 13:20:08 +0000 (16:20 +0300)
committerKalle Valo <kvalo@qca.qualcomm.com>
Wed, 14 May 2014 13:20:08 +0000 (16:20 +0300)
commite21353576df1fae38710bdbff1c3abfe49f651cd
tree3074ad8e4be3762cae1e1f5d11d103ce8c216329
parentd9bc4b9b693d52dc14dc1de5dfec760634067d8c
parent5f407acbb7d6a92841c455b37a6ad4833757740e
Merge remote-tracking branch 'wireless-next/master' into ath-next
drivers/net/wireless/ath/ath10k/mac.c