arch/arm/mach-shmobile/board-marzen.c · 4022acdb5b2b65ad2fe078be39bda9c5377c4e04 · nexedi / linux

Merge branch 'renesas/boards2' into next/late · 4022acdb

Arnd Bergmann authored Jun 27, 2013

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>

4022acdb

board-marzen.c 10.1 KB

Replace board-marzen.c