Merge tag 'r8169-upstream-20061204-00' of git://electric-eye.fr.zoreil.com/home/romie...
authorJeff Garzik <jeff@garzik.org>
Thu, 7 Dec 2006 10:05:58 +0000 (05:05 -0500)
committerJeff Garzik <jeff@garzik.org>
Thu, 7 Dec 2006 10:05:58 +0000 (05:05 -0500)
commitf1ff0fdc353ca00ff43b7b039944b8070da22242
tree12aca4eb7f9fb6099c8a0bd4b1eccdd522983d30
parent359f2d17e32b32f53577375f83fb06d34e31bfe8
parentcc9f022d97d08e4e36d38661857991fe91447d68
Merge tag 'r8169-upstream-20061204-00' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6 into upstream
drivers/net/r8169.c