Merge branch 'wireless-next' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...

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

Mon, 6 Feb 2012 19:45:53 +0000 (14:45 -0500)

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

Mon, 6 Feb 2012 19:45:53 +0000 (14:45 -0500)
author John W. Linville <linville@tuxdriver.com>
Mon, 6 Feb 2012 19:45:53 +0000 (14:45 -0500)
committer John W. Linville <linville@tuxdriver.com>
Mon, 6 Feb 2012 19:45:53 +0000 (14:45 -0500)
diff --cc drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
Simple merge
author	John W. Linville <linville@tuxdriver.com>
	Mon, 6 Feb 2012 19:45:53 +0000 (14:45 -0500)
committer	John W. Linville <linville@tuxdriver.com>
	Mon, 6 Feb 2012 19:45:53 +0000 (14:45 -0500)