Merge branch 'for-linville' of git://github.com/kvalo/ath
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 30 May 2014 17:43:31 +0000 (13:43 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 30 May 2014 17:43:31 +0000 (13:43 -0400)
commit8f1e5d31cf92b037506d5222fc713f27b5d46718
tree2532bcbfeb4bb146cde3a90427067a0529d32447
parent57afc62e9422954329adecdb8251cc232e9fe308
parent08b8aa0931830cc4b96b47f884fe623aef5c4b84
Merge branch 'for-linville' of git://github.com/kvalo/ath
drivers/net/wireless/ath/ath9k/main.c