]> git.neil.brown.name Git - history.git/commitdiff
Merge bk://kernel.bkbits.net/davem/sparc-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Sun, 6 Feb 2005 01:36:18 +0000 (17:36 -0800)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sun, 6 Feb 2005 01:36:18 +0000 (17:36 -0800)
into ppc970.osdl.org:/home/torvalds/v2.6/linux


Trivial merge