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

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

Tue, 12 Feb 2013 17:51:08 +0000 (12:51 -0500)

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

Tue, 12 Feb 2013 17:51:08 +0000 (12:51 -0500)
author John W. Linville <linville@tuxdriver.com>
Tue, 12 Feb 2013 17:51:08 +0000 (12:51 -0500)
committer John W. Linville <linville@tuxdriver.com>
Tue, 12 Feb 2013 17:51:08 +0000 (12:51 -0500)
diff --cc drivers/net/wireless/iwlwifi/dvm/mac80211.c
Simple merge
diff --cc drivers/net/wireless/iwlwifi/mvm/mac80211.c
Simple merge
author	John W. Linville <linville@tuxdriver.com>
	Tue, 12 Feb 2013 17:51:08 +0000 (12:51 -0500)
committer	John W. Linville <linville@tuxdriver.com>
	Tue, 12 Feb 2013 17:51:08 +0000 (12:51 -0500)
		1	2
drivers/net/wireless/iwlwifi/dvm/mac80211.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/mac80211.c	patch \|	diff1 \|	diff2 \|	blob \| history