Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linvill...

author Jeff Garzik <jeff@garzik.org>

Sun, 23 Dec 2007 04:25:16 +0000 (23:25 -0500)

committer Jeff Garzik <jeff@garzik.org>

Sun, 23 Dec 2007 04:25:16 +0000 (23:25 -0500)
author Jeff Garzik <jeff@garzik.org>
Sun, 23 Dec 2007 04:25:16 +0000 (23:25 -0500)
committer Jeff Garzik <jeff@garzik.org>
Sun, 23 Dec 2007 04:25:16 +0000 (23:25 -0500)
diff --cc drivers/net/wireless/Kconfig
Simple merge
diff --cc drivers/net/wireless/ipw2200.c
Simple merge
diff --cc drivers/net/wireless/iwlwifi/iwl3945-base.c
Simple merge
diff --cc drivers/net/wireless/iwlwifi/iwl4965-base.c
Simple merge
author	Jeff Garzik <jeff@garzik.org>
	Sun, 23 Dec 2007 04:25:16 +0000 (23:25 -0500)
committer	Jeff Garzik <jeff@garzik.org>
	Sun, 23 Dec 2007 04:25:16 +0000 (23:25 -0500)
		1	2
drivers/net/wireless/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ipw2200.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl3945-base.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl4965-base.c	patch \|	diff1 \|	diff2 \|	blob \| history