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

author John W. Linville <linville@tuxdriver.com>

Tue, 22 Jan 2013 20:40:56 +0000 (15:40 -0500)

committer John W. Linville <linville@tuxdriver.com>

Tue, 22 Jan 2013 20:40:56 +0000 (15:40 -0500)
author John W. Linville <linville@tuxdriver.com>
Tue, 22 Jan 2013 20:40:56 +0000 (15:40 -0500)
committer John W. Linville <linville@tuxdriver.com>
Tue, 22 Jan 2013 20:40:56 +0000 (15:40 -0500)
diff --cc drivers/net/wireless/ath/ath9k/init.c
Simple merge
diff --cc drivers/net/wireless/ath/carl9170/main.c
Simple merge
diff --cc drivers/net/wireless/mwifiex/cfg80211.c
Simple merge
author	John W. Linville <linville@tuxdriver.com>
	Tue, 22 Jan 2013 20:40:56 +0000 (15:40 -0500)
committer	John W. Linville <linville@tuxdriver.com>
	Tue, 22 Jan 2013 20:40:56 +0000 (15:40 -0500)
		1	2
drivers/net/wireless/ath/ath9k/init.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/carl9170/main.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/cfg80211.c	patch \|	diff1 \|	diff2 \|	blob \| history