Merge tag 'for-linville-20140717' of git://github.com/kvalo/ath
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 18 Jul 2014 17:44:50 +0000 (13:44 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 18 Jul 2014 17:44:50 +0000 (13:44 -0400)
commit5235cd21212ca3701b678d7e93682999a772c995
treeb45a81a0bf30cff43e7b6e9fc40606f7129a2ee3
parentfd29d2cdd5866fd64f2704663535274f5fcaf0af
parent993619443774f7ef4df3b98655df4c3bf298548c
Merge tag 'for-linville-20140717' of git://github.com/kvalo/ath
drivers/net/wireless/ath/ath10k/core.c
drivers/net/wireless/ath/ath6kl/wmi.h