]> git.hungrycats.org Git - linux/commitdiff
Merge ppc970:v2.5/linux into home.osdl.org:/home/torvalds/v2.5/linux
authorLinus Torvalds <torvalds@home.osdl.org>
Fri, 13 Feb 2004 13:10:24 +0000 (05:10 -0800)
committerLinus Torvalds <torvalds@home.osdl.org>
Fri, 13 Feb 2004 13:10:24 +0000 (05:10 -0800)

Trivial merge