Merge branch 'upstream-fixes' into upstream
commit846050dd49719b1f68248807bba5c27bfc86f81a
authorJeff Garzik <jeff@garzik.org>
Sat, 19 Aug 2006 21:45:11 +0000 (19 17:45 -0400)
committerJeff Garzik <jeff@garzik.org>
Sat, 19 Aug 2006 21:45:11 +0000 (19 17:45 -0400)
tree79922936e8cde867ba90d753f79aa61f575e162b
parent49666145de54b5d6d256442bb1bec03ffae1ac76
parent2ca2d5e84c19ddbc0126087af6288533a05f1799
Merge branch 'upstream-fixes' into upstream
drivers/net/Kconfig
drivers/net/Makefile
drivers/net/smc911x.c
drivers/net/sundance.c