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

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

Wed, 12 Feb 2014 20:24:14 +0000 (15:24 -0500)

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

Wed, 12 Feb 2014 20:24:14 +0000 (15:24 -0500)
author John W. Linville <linville@tuxdriver.com>
Wed, 12 Feb 2014 20:24:14 +0000 (15:24 -0500)
committer John W. Linville <linville@tuxdriver.com>
Wed, 12 Feb 2014 20:24:14 +0000 (15:24 -0500)
diff --cc drivers/net/wireless/iwlwifi/dvm/rs.c
Simple merge
diff --cc drivers/net/wireless/iwlwifi/mvm/rs.c
Simple merge
diff --cc drivers/net/wireless/iwlwifi/mvm/rx.c
Simple merge
diff --cc drivers/net/wireless/iwlwifi/mvm/scan.c
Simple merge
author	John W. Linville <linville@tuxdriver.com>
	Wed, 12 Feb 2014 20:24:14 +0000 (15:24 -0500)
committer	John W. Linville <linville@tuxdriver.com>
	Wed, 12 Feb 2014 20:24:14 +0000 (15:24 -0500)
		1	2
drivers/net/wireless/iwlwifi/dvm/rs.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/rs.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/rx.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/scan.c	patch \|	diff1 \|	diff2 \|	blob \| history