Merge branch 'upstream-fixes' into upstream

author Jeff Garzik <jeff@garzik.org>

Sat, 29 Jul 2006 04:32:42 +0000 (00:32 -0400)

committer Jeff Garzik <jeff@garzik.org>

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