Merge branch 'for-linville' of git://github.com/kvalo/ath
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 24 Feb 2014 20:02:36 +0000 (15:02 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 24 Feb 2014 20:02:36 +0000 (15:02 -0500)
commit9e4b4269ecee426f1647425a24186dd1566db554
tree8845330fe8a9f2970447388b32946bac7f2ad542
parent161d7855543520cde5f49df788b0ea0553a9f83a
parent9797febc4cc112869b19a110f70e0dedb1bb63d6
Merge branch 'for-linville' of git://github.com/kvalo/ath
drivers/net/wireless/ath/ath.h
drivers/net/wireless/ath/ath10k/txrx.c