Automatic merge of /spare/repo/netdev-2.6 branch we18-ieee80211

author <jgarzik@pretzel.yyz.us> <>

Sat, 28 May 2005 02:08:07 +0000 (22:08 -0400)

committer Jeff Garzik <jgarzik@pobox.com>

Sat, 28 May 2005 02:08:07 +0000 (22:08 -0400)
author <jgarzik@pretzel.yyz.us> <>
Sat, 28 May 2005 02:08:07 +0000 (22:08 -0400)
committer Jeff Garzik <jgarzik@pobox.com>
Sat, 28 May 2005 02:08:07 +0000 (22:08 -0400)
diff --cc drivers/net/wireless/Kconfig
Simple merge
diff --cc drivers/net/wireless/airo.c
Simple merge
author	<jgarzik@pretzel.yyz.us> <>
	Sat, 28 May 2005 02:08:07 +0000 (22:08 -0400)
committer	Jeff Garzik <jgarzik@pobox.com>
	Sat, 28 May 2005 02:08:07 +0000 (22:08 -0400)
		1	2
drivers/net/wireless/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/airo.c	patch \|	diff1 \|	diff2 \|	blob \| history