tree c519653bbcd99608baab22da39de1abd91a2c7f1
parent 9ee73aec3570733dc3b9a6b4782db6b323abfa5e
parent 413bfd0e67894c930242482cd15ac09a800e2ab8
author Olof Johansson <olof@lixom.net> 1370935977 -0700
committer Olof Johansson <olof@lixom.net> 1370935977 -0700

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