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

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

Wed, 22 Aug 2012 18:15:47 +0000 (14:15 -0400)

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

Wed, 22 Aug 2012 18:15:47 +0000 (14:15 -0400)
author John W. Linville <linville@tuxdriver.com>
Wed, 22 Aug 2012 18:15:47 +0000 (14:15 -0400)
committer John W. Linville <linville@tuxdriver.com>
Wed, 22 Aug 2012 18:15:47 +0000 (14:15 -0400)
diff --cc drivers/net/wireless/iwlwifi/dvm/agn.h
Simple merge
diff --cc drivers/net/wireless/iwlwifi/dvm/mac80211.c
Simple merge
diff --cc drivers/net/wireless/iwlwifi/dvm/tx.c
Simple merge
diff --cc drivers/net/wireless/iwlwifi/pcie/trans.c
Simple merge
author	John W. Linville <linville@tuxdriver.com>
	Wed, 22 Aug 2012 18:15:47 +0000 (14:15 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Wed, 22 Aug 2012 18:15:47 +0000 (14:15 -0400)
		1	2
drivers/net/wireless/iwlwifi/dvm/agn.h	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/dvm/mac80211.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/dvm/tx.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/pcie/trans.c	patch \|	diff1 \|	diff2 \|	blob \| history