projects
/
linux-3.10.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
36239c6
3a09b1b
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Paul Mundt [Wed, 4 Aug 2010 04:52:34 +0000 (13:52 +0900)]
1
2
arch/sh/Kconfig
patch
|
diff1
|
diff2
|
blob
|
history
arch/sh/mm/init.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/sh/Kconfig
Simple merge
diff --cc
arch/sh/mm/init.c
Simple merge