arch/arm/mach-shmobile/include/mach/r8a7778.h · 41f0d0c25d4ccba8de8d5f463d50265aac23ef5d · Kirill Smelkov / linux

Merge branch 'renesas/soc' into next/boards · 41f0d0c2

Olof Johansson authored Jun 11, 2013

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

41f0d0c2

r8a7778.h 1.39 KB

Replace r8a7778.h