]> git.hungrycats.org Git - linux/commitdiff
Merge bk://ppc.bkbits.net/for-linus-ppc
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 4 Oct 2004 01:06:25 +0000 (18:06 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 4 Oct 2004 01:06:25 +0000 (18:06 -0700)
into ppc970.osdl.org:/home/torvalds/v2.6/linux


Trivial merge