Merge branch 'r8169-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu...
authorJeff Garzik <jeff@garzik.org>
Wed, 3 Sep 2008 14:21:20 +0000 (10:21 -0400)
committerJeff Garzik <jgarzik@redhat.com>
Wed, 3 Sep 2008 14:21:20 +0000 (10:21 -0400)
commit9389523a77be0a7e01d957c836733b5c9d5530a1
tree5ef303e24f23ffbcf74973f3d6238f2a4b71fd1d
parent3be1adfb912867e244729c3826b457ee76b8f737
parent2857ffb7b8913ef713533ac5783abd70a20529e4
Merge branch 'r8169-fixes' of git://git./linux/kernel/git/romieu/netdev-2.6 into upstream-next
drivers/net/r8169.c