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

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

Mon, 24 Sep 2012 18:37:36 +0000 (14:37 -0400)

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

Mon, 24 Sep 2012 18:37:36 +0000 (14:37 -0400)
author John W. Linville <linville@tuxdriver.com>
Mon, 24 Sep 2012 18:37:36 +0000 (14:37 -0400)
committer John W. Linville <linville@tuxdriver.com>
Mon, 24 Sep 2012 18:37:36 +0000 (14:37 -0400)
diff --cc drivers/net/wireless/iwlwifi/pcie/internal.h
Simple merge
diff --cc drivers/net/wireless/iwlwifi/pcie/rx.c
Simple merge
diff --cc drivers/net/wireless/iwlwifi/pcie/trans.c
Simple merge
author	John W. Linville <linville@tuxdriver.com>
	Mon, 24 Sep 2012 18:37:36 +0000 (14:37 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Mon, 24 Sep 2012 18:37:36 +0000 (14:37 -0400)
		1	2
drivers/net/wireless/iwlwifi/pcie/internal.h	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/pcie/rx.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/pcie/trans.c	patch \|	diff1 \|	diff2 \|	blob \| history