Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

author Linus Torvalds <[email protected]>

Tue, 10 Jan 2006 16:21:33 +0000 (08:21 -0800)

committer Linus Torvalds <[email protected]>

Tue, 10 Jan 2006 16:21:33 +0000 (08:21 -0800)
author Linus Torvalds <[email protected]>
Tue, 10 Jan 2006 16:21:33 +0000 (08:21 -0800)
committer Linus Torvalds <[email protected]>
Tue, 10 Jan 2006 16:21:33 +0000 (08:21 -0800)
diff --cc Makefile
Simple merge
diff --cc arch/powerpc/Makefile
Simple merge
author	Linus Torvalds <[email protected]>
	Tue, 10 Jan 2006 16:21:33 +0000 (08:21 -0800)
committer	Linus Torvalds <[email protected]>
	Tue, 10 Jan 2006 16:21:33 +0000 (08:21 -0800)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/powerpc/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history