Merge branch 'upstream-fixes' into upstream
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 2 Aug 2006 18:29:40 +0000 (14:29 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 2 Aug 2006 18:29:40 +0000 (14:29 -0400)
commit4456403f5ed589aeecc4271bc09f4ade6eae8adc
treece5f9d3416b1e47cdb0d40bd4226f6dcd121d20d
parent02b311bce9fc87987a123adc3e6a2d0a2caa70e2
parentfde627b54ce7bef094157074f3adb9b6e1a96d4c
Merge branch 'upstream-fixes' into upstream
drivers/net/wireless/zd1211rw/zd_usb.c