Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 24 Sep 2012 18:34:40 +0000 (14:34 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 24 Sep 2012 18:34:40 +0000 (14:34 -0400)
commit9b4e9e756541fd5d1223b323ed5a8a8545dd11cd
tree3eed3a2582532bd1fd890b58eadd472fcd2b1dc7
parent7a5f799becc51c842ec1a3aeb8dd82651aea7036
parent9385d04f2872057a2029901190391fe192b18693
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211-next
drivers/net/wireless/ath/ath5k/mac80211-ops.c
drivers/net/wireless/ath/ath9k/htc_drv_main.c
drivers/net/wireless/ath/ath9k/main.c