git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
018a3fc
6155f77
)
Merge branch 'rmobile/smp' into rmobile-latest
author
Paul Mundt
<lethal@linux-sh.org>
Fri, 7 Jan 2011 01:51:35 +0000
(10:51 +0900)
committer
Paul Mundt
<lethal@linux-sh.org>
Fri, 7 Jan 2011 01:51:35 +0000
(10:51 +0900)
Conflicts:
arch/arm/Kconfig
arch/arm/mach-shmobile/include/mach/entry-macro-intc.S
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff