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

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

Wed, 29 May 2013 18:50:45 +0000 (14:50 -0400)

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

Wed, 29 May 2013 18:50:45 +0000 (14:50 -0400)
author John W. Linville <linville@tuxdriver.com>
Wed, 29 May 2013 18:50:45 +0000 (14:50 -0400)
committer John W. Linville <linville@tuxdriver.com>
Wed, 29 May 2013 18:50:45 +0000 (14:50 -0400)
diff --cc drivers/net/wireless/ath/ath9k/main.c
Simple merge
diff --cc drivers/net/wireless/mwifiex/cfg80211.c
Simple merge
diff --cc drivers/net/wireless/mwifiex/cmdevt.c
Simple merge
diff --cc drivers/net/wireless/mwifiex/main.c
Simple merge
author	John W. Linville <linville@tuxdriver.com>
	Wed, 29 May 2013 18:50:45 +0000 (14:50 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Wed, 29 May 2013 18:50:45 +0000 (14:50 -0400)
		1	2
drivers/net/wireless/ath/ath9k/main.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/cfg80211.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/cmdevt.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/main.c	patch \|	diff1 \|	diff2 \|	blob \| history