Merge branch 'r8169-for-jeff-20070806' of git://electric-eye.fr.zoreil.com/home/romie...
authorJeff Garzik <jeff@garzik.org>
Tue, 7 Aug 2007 21:28:23 +0000 (17:28 -0400)
committerJeff Garzik <jeff@garzik.org>
Tue, 7 Aug 2007 21:28:23 +0000 (17:28 -0400)
commitc21723edd5f6c288ab613ed658b7140e07fc7209
tree313bd1e38f290c988e8ebb468365d9299001a2fb
parent9b7530c83d04da28fdded741e718721d509c74b1
parent313b0305b5a1e7e0fb39383befbf79558ce68a9c
Merge branch 'r8169-for-jeff-20070806' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6 into upstream-fixes
drivers/net/r8169.c