Merge branch 'upstream-fixes' into upstream
authorJeff Garzik <jeff@garzik.org>
Sat, 20 May 2006 04:26:26 +0000 (00:26 -0400)
committerJeff Garzik <jeff@garzik.org>
Sat, 20 May 2006 04:26:26 +0000 (00:26 -0400)
commit4e3ceac609cce39cb96e0eb8604934592371ed8c
tree019b674bf79489128b4f1985ea99c5deca2cb15b
parentbadc48e6605ddeeb2484afae5993c859494decaa
parentbb02aacc02c6002143a1cfc313d144a413eec8d0
Merge branch 'upstream-fixes' into upstream
drivers/net/wireless/bcm43xx/bcm43xx_main.c