Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
Linus Torvalds [Thu, 5 Jan 2006 00:36:52 +0000 (16:36 -0800)]
1  2 
Makefile
init/Kconfig
scripts/kconfig/Makefile
scripts/kconfig/util.c

diff --cc Makefile
Simple merge
diff --cc init/Kconfig
Simple merge
Simple merge
Simple merge