]> git.hungrycats.org Git - linux/commitdiff
Merge bk://kernel.bkbits.net/jgarzik/net-drivers-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 22 Oct 2004 00:56:54 +0000 (17:56 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 22 Oct 2004 00:56:54 +0000 (17:56 -0700)
into ppc970.osdl.org:/home/torvalds/v2.6/linux


Trivial merge