commit | 4022acdb5b2b65ad2fe078be39bda9c5377c4e04 | [log] [tgz] |
---|---|---|
author | Arnd Bergmann <arnd@arndb.de> | Thu Jun 27 14:26:06 2013 +0200 |
committer | Arnd Bergmann <arnd@arndb.de> | Thu Jun 27 14:26:06 2013 +0200 |
tree | 9afc2b61b309e61e2e136f0b881acd73e4372c9b | |
parent | 37c5a9f7d73352650447c3984a39007304287303 [diff] | |
parent | 2c83322ce820bcf2d5e8265de831489076ee211e [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>