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

author Linus Torvalds <[email protected]>

Tue, 4 Jul 2006 04:26:12 +0000 (21:26 -0700)

committer Linus Torvalds <[email protected]>

Tue, 4 Jul 2006 04:26:12 +0000 (21:26 -0700)
author Linus Torvalds <[email protected]>
Tue, 4 Jul 2006 04:26:12 +0000 (21:26 -0700)
committer Linus Torvalds <[email protected]>
Tue, 4 Jul 2006 04:26:12 +0000 (21:26 -0700)
diff --cc arch/powerpc/platforms/chrp/setup.c
Simple merge
diff --cc arch/powerpc/platforms/powermac/bootx_init.c
Simple merge
author	Linus Torvalds <[email protected]>
	Tue, 4 Jul 2006 04:26:12 +0000 (21:26 -0700)
committer	Linus Torvalds <[email protected]>
	Tue, 4 Jul 2006 04:26:12 +0000 (21:26 -0700)
		1	2
arch/powerpc/platforms/chrp/setup.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/powermac/bootx_init.c	patch \|	diff1 \|	diff2 \|	blob \| history