Merge /spare/repo/netdev-2.6 branch 'ieee80211'

author Jeff Garzik <jgarzik@pobox.com>

Tue, 28 Jun 2005 02:50:10 +0000 (22:50 -0400)

committer Jeff Garzik <jgarzik@pobox.com>

Tue, 28 Jun 2005 02:50:10 +0000 (22:50 -0400)
author Jeff Garzik <jgarzik@pobox.com>
Tue, 28 Jun 2005 02:50:10 +0000 (22:50 -0400)
committer Jeff Garzik <jgarzik@pobox.com>
Tue, 28 Jun 2005 02:50:10 +0000 (22:50 -0400)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/net/wireless/airo.c
Simple merge
author	Jeff Garzik <jgarzik@pobox.com>
	Tue, 28 Jun 2005 02:50:10 +0000 (22:50 -0400)
committer	Jeff Garzik <jgarzik@pobox.com>
	Tue, 28 Jun 2005 02:50:10 +0000 (22:50 -0400)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/airo.c	patch \|	diff1 \|	diff2 \|	blob \| history