projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9979ead 4f0210b)
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 patch | diff1 | diff2 | blob | history
arch/powerpc/Makefile patch | diff1 | diff2 | blob | history

diff --cc Makefile
Simple merge
diff --cc arch/powerpc/Makefile
Simple merge
Motorola kernel-slsi