Merge branch 'upstream-fixes' into upstream

author Jeff Garzik <[email protected]>

Thu, 3 Aug 2006 21:20:37 +0000 (17:20 -0400)

committer Jeff Garzik <[email protected]>

Thu, 3 Aug 2006 21:20:37 +0000 (17:20 -0400)
author Jeff Garzik <[email protected]>
Thu, 3 Aug 2006 21:20:37 +0000 (17:20 -0400)
committer Jeff Garzik <[email protected]>
Thu, 3 Aug 2006 21:20:37 +0000 (17:20 -0400)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/net/wireless/zd1211rw/zd_usb.c
Simple merge
author	Jeff Garzik <[email protected]>
	Thu, 3 Aug 2006 21:20:37 +0000 (17:20 -0400)
committer	Jeff Garzik <[email protected]>
	Thu, 3 Aug 2006 21:20:37 +0000 (17:20 -0400)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/zd1211rw/zd_usb.c	patch \|	diff1 \|	diff2 \|	blob \| history