Merge branch 'upstream-fixes' into upstream

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

Fri, 5 May 2006 20:56:24 +0000 (16:56 -0400)

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

Fri, 5 May 2006 20:56:24 +0000 (16:56 -0400)
author John W. Linville <linville@tuxdriver.com>
Fri, 5 May 2006 20:56:24 +0000 (16:56 -0400)
committer John W. Linville <linville@tuxdriver.com>
Fri, 5 May 2006 20:56:24 +0000 (16:56 -0400)
diff --cc drivers/net/wireless/bcm43xx/bcm43xx_main.c
Simple merge
diff --cc include/net/ieee80211.h
Simple merge
diff --cc net/ieee80211/softmac/ieee80211softmac_assoc.c
Simple merge
author	John W. Linville <linville@tuxdriver.com>
	Fri, 5 May 2006 20:56:24 +0000 (16:56 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Fri, 5 May 2006 20:56:24 +0000 (16:56 -0400)
		1	2
drivers/net/wireless/bcm43xx/bcm43xx_main.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/net/ieee80211.h	patch \|	diff1 \|	diff2 \|	blob \| history
net/ieee80211/softmac/ieee80211softmac_assoc.c	patch \|	diff1 \|	diff2 \|	blob \| history