Merge http://linux-isdn.bkbits.net/linux-2.5.make

author Linus Torvalds <torvalds@home.transmeta.com>

Wed, 30 Oct 2002 01:14:57 +0000 (17:14 -0800)

committer Linus Torvalds <torvalds@penguin.transmeta.com>

Wed, 30 Oct 2002 01:14:57 +0000 (17:14 -0800)
author Linus Torvalds <torvalds@home.transmeta.com>
Wed, 30 Oct 2002 01:14:57 +0000 (17:14 -0800)
committer Linus Torvalds <torvalds@penguin.transmeta.com>
Wed, 30 Oct 2002 01:14:57 +0000 (17:14 -0800)
diff --cc Makefile
Simple merge
diff --cc scripts/Makefile.build
Simple merge
author	Linus Torvalds <torvalds@home.transmeta.com>
	Wed, 30 Oct 2002 01:14:57 +0000 (17:14 -0800)
committer	Linus Torvalds <torvalds@penguin.transmeta.com>
	Wed, 30 Oct 2002 01:14:57 +0000 (17:14 -0800)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
scripts/Makefile.build	patch \|	diff1 \|	diff2 \|	blob \| history