Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-bugfix
Linus Torvalds [Tue, 7 Feb 2006 18:01:43 +0000 (10:01 -0800)]
1  2 
Makefile

diff --cc Makefile
Simple merge