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

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

Mon, 4 Apr 2011 20:10:36 +0000 (16:10 -0400)

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

Mon, 4 Apr 2011 20:10:36 +0000 (16:10 -0400)
author John W. Linville <linville@tuxdriver.com>
Mon, 4 Apr 2011 20:10:36 +0000 (16:10 -0400)
committer John W. Linville <linville@tuxdriver.com>
Mon, 4 Apr 2011 20:10:36 +0000 (16:10 -0400)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/net/wireless/iwlwifi/iwl-1000.c
Simple merge
diff --cc drivers/net/wireless/iwlwifi/iwl-5000.c
Simple merge
diff --cc drivers/net/wireless/iwlwifi/iwl-agn-lib.c
Simple merge
diff --cc drivers/net/wireless/iwlwifi/iwl-agn.c
Simple merge
author	John W. Linville <linville@tuxdriver.com>
	Mon, 4 Apr 2011 20:10:36 +0000 (16:10 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Mon, 4 Apr 2011 20:10:36 +0000 (16:10 -0400)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-1000.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-5000.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-agn-lib.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-agn.c	patch \|	diff1 \|	diff2 \|	blob \| history