]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
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)
commitab396e91bfe953db26fa1083d9c3e7a4fbe0334a
tree81db9e5f919b84dcb4284ca8cdf675e13716c191
parent9979ead5d1eb23191a00453559927c5abf9087e2
parent4f0210b9c4889eede9f8f379f93570c01998ccb9
Merge ssh:///pub/scm/linux/kernel/git/sam/kbuild

Fix up some trivial conflicts in {i386|ia64}/Makefile
Makefile
arch/powerpc/Makefile