]> git.neil.brown.name Git - history.git/commitdiff
Merge bk://kernel.bkbits.net/davem/sparc-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 20 Oct 2004 10:31:29 +0000 (03:31 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 20 Oct 2004 10:31:29 +0000 (03:31 -0700)
into ppc970.osdl.org:/home/torvalds/v2.6/linux


Trivial merge