Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
Linus Torvalds [Thu, 10 Nov 2005 21:45:34 +0000 (13:45 -0800)]
1  2 
Makefile

diff --cc Makefile
Simple merge