git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9ee73ae
413bfd0
)
Merge branch 'renesas/soc' into next/boards
author
Olof Johansson
<olof@lixom.net>
Tue, 11 Jun 2013 07:32:57 +0000
(
00:32
-0700)
committer
Olof Johansson
<olof@lixom.net>
Tue, 11 Jun 2013 07:32:57 +0000
(
00:32
-0700)
Signed-off-by: Olof Johansson <olof@lixom.net>
Conflicts:
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-shmobile/include/mach/r8a7778.h
arch/arm/mach-shmobile/setup-r8a7778.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff