Merge branch 'upstream-fixes' into upstream
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 27 Jul 2006 19:06:13 +0000 (15:06 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 27 Jul 2006 19:06:13 +0000 (15:06 -0400)
commit416512cb75f51f3d12e5e1aa57b6a36760fd12c9
treef8081ffd9ce0b7a5867d5ad262345c222122abb6
parent20f99dcf417a28089ef6c877ae97f5dec2eab435
parentca0084fa90533687b6317e6d084141da87c74d5c
Merge branch 'upstream-fixes' into upstream
drivers/net/wireless/bcm43xx/bcm43xx_main.c