Merge branch 'upstream-fixes'
Jeff Garzik [Tue, 4 Oct 2005 09:30:02 +0000 (05:30 -0400)]
1  2 
drivers/net/Kconfig
drivers/net/ns83820.c
net/ieee80211/ieee80211_tx.c

Simple merge
Simple merge
Simple merge