]> git.hungrycats.org Git - linux/commitdiff
Merge bk://kernel.bkbits.net/davem/sparc-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 6 Oct 2004 00:36:37 +0000 (17:36 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 6 Oct 2004 00:36:37 +0000 (17:36 -0700)
into ppc970.osdl.org:/home/torvalds/v2.6/linux


Trivial merge