Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
Linus Torvalds [Mon, 16 Jan 2006 19:19:04 +0000 (11:19 -0800)]
1  2 
Makefile

diff --cc Makefile
Simple merge