Merge branch 'renesas/soc' into next/boards
authorOlof Johansson <olof@lixom.net>
Tue, 11 Jun 2013 07:32:57 +0000 (00:32 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 11 Jun 2013 07:32:57 +0000 (00:32 -0700)
commit41f0d0c25d4ccba8de8d5f463d50265aac23ef5d
treec519653bbcd99608baab22da39de1abd91a2c7f1
parent9ee73aec3570733dc3b9a6b4782db6b323abfa5e
parent413bfd0e67894c930242482cd15ac09a800e2ab8
Merge branch 'renesas/soc' into next/boards

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
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-shmobile/include/mach/r8a7778.h
arch/arm/mach-shmobile/setup-r8a7778.c
arch/arm/mach-shmobile/setup-sh73a0.c