]> git.hungrycats.org Git - linux/commitdiff
Merge bk://kernel.bkbits.net/jgarzik/net-drivers-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 5 Oct 2004 10:41:14 +0000 (03:41 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 5 Oct 2004 10:41:14 +0000 (03:41 -0700)
into ppc970.osdl.org:/home/torvalds/v2.6/linux


Trivial merge