Merge branch 'upstream-fixes' into upstream

author Jeff Garzik <jeff@garzik.org>

Sat, 20 May 2006 04:26:26 +0000 (00:26 -0400)

committer Jeff Garzik <jeff@garzik.org>

Sat, 20 May 2006 04:26:26 +0000 (00:26 -0400)
author Jeff Garzik <jeff@garzik.org>
Sat, 20 May 2006 04:26:26 +0000 (00:26 -0400)
committer Jeff Garzik <jeff@garzik.org>
Sat, 20 May 2006 04:26:26 +0000 (00:26 -0400)
diff --cc drivers/net/wireless/bcm43xx/bcm43xx_main.c
Simple merge
author	Jeff Garzik <jeff@garzik.org>
	Sat, 20 May 2006 04:26:26 +0000 (00:26 -0400)
committer	Jeff Garzik <jeff@garzik.org>
	Sat, 20 May 2006 04:26:26 +0000 (00:26 -0400)