Merge branch 'upstream-fixes' into upstream
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 5 May 2006 20:56:24 +0000 (16:56 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 5 May 2006 20:56:24 +0000 (16:56 -0400)
commitfd5226a72694d1c0abe1cc39711a86f1754e637d
tree1d90b27c392fb2ef9859f2652dee7640916ed806
parentaad61439e6a00bdb72cb649e11f6e166590c5f66
parent178e0cc5ff249965c6cfbd78b1af6a5e614d837c
Merge branch 'upstream-fixes' into upstream
drivers/net/wireless/bcm43xx/bcm43xx_main.c
include/net/ieee80211.h
net/ieee80211/softmac/ieee80211softmac_assoc.c