]> git.hungrycats.org Git - linux/commitdiff
Merge http://linux-isdn.bkbits.net/linux-2.5.make
authorLinus Torvalds <torvalds@penguin.transmeta.com>
Mon, 20 May 2002 05:48:18 +0000 (22:48 -0700)
committerLinus Torvalds <torvalds@penguin.transmeta.com>
Mon, 20 May 2002 05:48:18 +0000 (22:48 -0700)
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

1  2 
Makefile

diff --cc Makefile
Simple merge