Merge branch 'upstream-fixes' into upstream
Jeff Garzik [Thu, 3 Aug 2006 21:20:37 +0000 (17:20 -0400)]
1  2 
MAINTAINERS
drivers/net/wireless/zd1211rw/zd_usb.c

diff --cc MAINTAINERS
Simple merge