projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 37c5a9f 2c83322)
Merge branch 'renesas/boards2' into next/late
authorArnd Bergmann <arnd@arndb.de>
Thu, 27 Jun 2013 12:26:06 +0000 (14:26 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 27 Jun 2013 12:26:06 +0000 (14:26 +0200)
commit4022acdb5b2b65ad2fe078be39bda9c5377c4e04
tree9afc2b61b309e61e2e136f0b881acd73e4372c9btree | snapshot
parent37c5a9f7d73352650447c3984a39007304287303commit | diff
parent2c83322ce820bcf2d5e8265de831489076ee211ecommit | diff
Merge branch 'renesas/boards2' into next/late

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>
arch/arm/mach-shmobile/board-marzen.c diff1 | diff2 | blob | history
ep93xx device tree rework repo: git://git.maquefel.me/linux.git