Merge branch 'upstream-fixes' into upstream
authorJeff Garzik <jeff@garzik.org>
Thu, 3 Aug 2006 21:20:37 +0000 (17:20 -0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 3 Aug 2006 21:20:37 +0000 (17:20 -0400)
commit23946a8a980d13af7b84bcf3ce023e0d166ec83f
tree193d2959a7b62b48aaf2236447f1378779e55104
parent66e8bb97055ff22a0e5ea89c0a75a35f8738cc96
parent2b14c30b46e007a16c665cc86329bf4a1d9ff6ee
Merge branch 'upstream-fixes' into upstream
MAINTAINERS
drivers/net/wireless/zd1211rw/zd_usb.c