]> git.hungrycats.org Git - linux/commitdiff
Merge home:v2.5/linux
authorLinus Torvalds <torvalds@penguin.transmeta.com>
Thu, 20 Jun 2002 06:12:04 +0000 (23:12 -0700)
committerLinus Torvalds <torvalds@penguin.transmeta.com>
Thu, 20 Jun 2002 06:12:04 +0000 (23:12 -0700)
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

1  2 
Makefile

diff --cc Makefile
Simple merge