]> 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>
Sat, 14 Feb 2004 03:52:16 +0000 (19:52 -0800)
committerLinus Torvalds <torvalds@home.osdl.org>
Sat, 14 Feb 2004 03:52:16 +0000 (19:52 -0800)

Trivial merge