git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
37c5a9f
2c83322
)
Merge branch 'renesas/boards2' into next/late
author
Arnd Bergmann
<arnd@arndb.de>
Thu, 27 Jun 2013 12:26:06 +0000
(14:26 +0200)
committer
Arnd Bergmann
<arnd@arndb.de>
Thu, 27 Jun 2013 12:26:06 +0000
(14:26 +0200)
Conflicts:
arch/arm/mach-shmobile/setup-r8a7778.c
This is a dependency for the Renesas sh-sci updates.
Signedf-off-by: Arnd Bergmann <arnd@arndb.de>
Trivial merge