Merge branch 'upstream-fixes' into upstream
authorJeff Garzik <jeff@garzik.org>
Thu, 21 Sep 2006 04:08:25 +0000 (00:08 -0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 21 Sep 2006 04:08:25 +0000 (00:08 -0400)
commitfd8ae94eea9bb4269d6dff1b47b9dc741bd70d0b
tree88f81d90021bd38b33622169103988f1e0a66510
parent783c99f42e221217761e9c319838d5533107f7cb
parent54caf44da31995df1f51174468fd9e83ca5c67a2
Merge branch 'upstream-fixes' into upstream
drivers/net/lp486e.c
drivers/net/mv643xx_eth.c