Merge branch 'upstream-fixes' into upstream
commitf5c7db1c915ddad32deda2afcdf7ecf1d84fc8fd
authorJeff Garzik <jeff@garzik.org>
Thu, 10 Aug 2006 12:31:03 +0000 (10 08:31 -0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 10 Aug 2006 12:31:03 +0000 (10 08:31 -0400)
treec62f64f0c7e446cd11a2092fd101e75a1cfa38a2
parente714d99cacac976deac3239c89f2c9e3125649b6
parent8d3d35b4e20dc2e678fc7cb51165905b5a32fb76
Merge branch 'upstream-fixes' into upstream
drivers/net/sky2.c