Merge branch 'upstream-fixes' into upstream
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 17 May 2006 18:54:09 +0000 (14:54 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 17 May 2006 18:54:09 +0000 (14:54 -0400)
commit59d4b684fbe74b25ac8593f39d2aaa86aa485b1f
treefb9b7de045e39313509c370dfa1c0ffa827f41be
parent5dd8816aeb1f068ade0349a22009ff7a66f25413
parentbc519f30eb039f023c15167663d5a8a14fed7dcb
Merge branch 'upstream-fixes' into upstream
drivers/net/wireless/bcm43xx/bcm43xx_main.c