Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
commita839688362e32f01608838516036697e30618b39
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 29 Jun 2005 04:24:32 +0000 (28 21:24 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 29 Jun 2005 04:24:32 +0000 (28 21:24 -0700)
treea174d93d568ba9735b13bb6ebb5f1a36c8f56308
parent2fa938b8a3964c21b23d9d095091e7abc88249c5
parent12dc2fdd3e6067f5137e4a6d8af0b1a994952f52
Merge /pub/scm/linux/kernel/git/davem/net-2.6
drivers/net/via-rhine.c