projects
/
linux-drm-fsl-dcu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9979ead
4f0210b
)
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
author
Linus Torvalds
<torvalds@g5.osdl.org>
Tue, 10 Jan 2006 16:21:33 +0000
(08:21 -0800)
committer
Linus 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
projects / linux-drm-fsl-dcu.git / commitdiff