Merge branch 'upstream-fixes' into upstream

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

Wed, 17 May 2006 18:54:09 +0000 (14:54 -0400)

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

Wed, 17 May 2006 18:54:09 +0000 (14:54 -0400)
author John W. Linville <linville@tuxdriver.com>
Wed, 17 May 2006 18:54:09 +0000 (14:54 -0400)
committer John W. Linville <linville@tuxdriver.com>
Wed, 17 May 2006 18:54:09 +0000 (14:54 -0400)
diff --cc drivers/net/wireless/bcm43xx/bcm43xx_main.c
Simple merge
author	John W. Linville <linville@tuxdriver.com>
	Wed, 17 May 2006 18:54:09 +0000 (14:54 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Wed, 17 May 2006 18:54:09 +0000 (14:54 -0400)