]> git.hungrycats.org Git - linux/commitdiff
Merge bk://kernel.bkbits.net/jgarzik/carmel-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 19 Mar 2004 06:18:26 +0000 (22:18 -0800)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 19 Mar 2004 06:18:26 +0000 (22:18 -0800)
into ppc970.osdl.org:/home/torvalds/v2.6/linux


Trivial merge