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
This commit is contained in:
Olof Johansson 2013-06-11 00:32:57 -07:00
commit 41f0d0c25d
11 changed files with 924 additions and 132 deletions