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

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

Fri, 3 Jan 2014 20:34:41 +0000 (15:34 -0500)

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

Fri, 3 Jan 2014 20:34:41 +0000 (15:34 -0500)
author John W. Linville <linville@tuxdriver.com>
Fri, 3 Jan 2014 20:34:41 +0000 (15:34 -0500)
committer John W. Linville <linville@tuxdriver.com>
Fri, 3 Jan 2014 20:34:41 +0000 (15:34 -0500)
diff --cc drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c
Simple merge
diff --cc drivers/net/wireless/iwlwifi/mvm/mac80211.c
Simple merge
diff --cc drivers/net/wireless/iwlwifi/mvm/sta.c
Simple merge
author	John W. Linville <linville@tuxdriver.com>
	Fri, 3 Jan 2014 20:34:41 +0000 (15:34 -0500)
committer	John W. Linville <linville@tuxdriver.com>
	Fri, 3 Jan 2014 20:34:41 +0000 (15:34 -0500)
		1	2
drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/mac80211.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/sta.c	patch \|	diff1 \|	diff2 \|	blob \| history