]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit31b82fffe732d7d0c6a2d9f6e4c198b7fe789a8d
tree3eed3a2582532bd1fd890b58eadd472fcd2b1dc7
parent186f3aff1246b3bdd7381819d79d04b4fbce8679
parent0acc59534fc7ae8bbbbdf1310b2c04a37c002199
Merge branch 'for-john' of git://git.kernel.org/pub/scm/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