]> git.hungrycats.org Git - linux/commitdiff
Merge bk://are.twiddle.net/axp-2.5
authorLinus Torvalds <torvalds@home.transmeta.com>
Tue, 15 Oct 2002 12:19:39 +0000 (05:19 -0700)
committerLinus Torvalds <torvalds@home.transmeta.com>
Tue, 15 Oct 2002 12:19:39 +0000 (05:19 -0700)
into home.transmeta.com:/home/torvalds/v2.5/linux


Trivial merge