Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-2.6.18
Greg Kroah-Hartman [Mon, 7 Aug 2006 20:39:55 +0000 (13:39 -0700)]
1  2 
Makefile

diff --cc Makefile
Simple merge