Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

author Linus Torvalds <torvalds@g5.osdl.org>

Thu, 5 Jan 2006 00:36:52 +0000 (16:36 -0800)

committer Linus Torvalds <torvalds@g5.osdl.org>

Thu, 5 Jan 2006 00:36:52 +0000 (16:36 -0800)
author Linus Torvalds <torvalds@g5.osdl.org>
Thu, 5 Jan 2006 00:36:52 +0000 (16:36 -0800)
committer Linus Torvalds <torvalds@g5.osdl.org>
Thu, 5 Jan 2006 00:36:52 +0000 (16:36 -0800)
diff --cc Makefile
Simple merge
diff --cc init/Kconfig
Simple merge
diff --cc scripts/kconfig/Makefile
Simple merge
diff --cc scripts/kconfig/util.c
Simple merge
author	Linus Torvalds <torvalds@g5.osdl.org>
	Thu, 5 Jan 2006 00:36:52 +0000 (16:36 -0800)
committer	Linus Torvalds <torvalds@g5.osdl.org>
	Thu, 5 Jan 2006 00:36:52 +0000 (16:36 -0800)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
init/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
scripts/kconfig/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
scripts/kconfig/util.c	patch \|	diff1 \|	diff2 \|	blob \| history