git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5ce2a2d
1cf215a
)
Merge branch 'rmobile/urgent' into rmobile-latest
author
Paul Mundt
<lethal@linux-sh.org>
Mon, 20 Dec 2010 15:40:51 +0000
(
00:40
+0900)
committer
Paul Mundt
<lethal@linux-sh.org>
Mon, 20 Dec 2010 15:40:51 +0000
(
00:40
+0900)
Conflicts:
arch/arm/mach-shmobile/include/mach/entry-macro.S
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff