]> git.hungrycats.org Git - linux/commitdiff
Merge bk://kernel.bkbits.net/davem/net-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 10 Aug 2004 03:00:51 +0000 (20:00 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 10 Aug 2004 03:00:51 +0000 (20:00 -0700)
into ppc970.osdl.org:/home/torvalds/v2.6/linux

1  2 
arch/sparc64/defconfig

Simple merge