]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 10 Jan 2006 16:21:33 +0000 (08:21 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 10 Jan 2006 16:21:33 +0000 (08:21 -0800)
Fix up some trivial conflicts in {i386|ia64}/Makefile

1  2 
Makefile
arch/powerpc/Makefile

diff --cc Makefile
Simple merge
Simple merge