]> git.baikalelectronics.ru Git - kernel.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)
commit36bde8b6bb61b6ca08f811c650c4540d1f768d50
tree81db9e5f919b84dcb4284ca8cdf675e13716c191
parentd776af323ccd72c9037dc6b7393cc662f48d21e2
parenta9375dcfab45802b008f0a4b79406687690e9c48
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

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