Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...

author John W. Linville <[email protected]>

Mon, 24 Sep 2012 18:34:40 +0000 (14:34 -0400)

committer John W. Linville <[email protected]>

Mon, 24 Sep 2012 18:34:40 +0000 (14:34 -0400)
author John W. Linville <[email protected]>
Mon, 24 Sep 2012 18:34:40 +0000 (14:34 -0400)
committer John W. Linville <[email protected]>
Mon, 24 Sep 2012 18:34:40 +0000 (14:34 -0400)
diff --cc drivers/net/wireless/ath/ath5k/mac80211-ops.c
Simple merge
diff --cc drivers/net/wireless/ath/ath9k/htc_drv_main.c
Simple merge
diff --cc drivers/net/wireless/ath/ath9k/main.c
Simple merge
author	John W. Linville <[email protected]>
	Mon, 24 Sep 2012 18:34:40 +0000 (14:34 -0400)
committer	John W. Linville <[email protected]>
	Mon, 24 Sep 2012 18:34:40 +0000 (14:34 -0400)
		1	2
drivers/net/wireless/ath/ath5k/mac80211-ops.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/htc_drv_main.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/main.c	patch \|	diff1 \|	diff2 \|	blob \| history