]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
projects / thirdparty / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 37c5a9f 2c83322)
Merge branch 'renesas/boards2' into next/late
authorArnd Bergmann <arnd@arndb.de>
Thu, 27 Jun 2013 12:26:06 +0000 (14:26 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 27 Jun 2013 12:26:06 +0000 (14:26 +0200)
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>
1  2 
arch/arm/mach-shmobile/board-marzen.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/mach-shmobile/board-marzen.c
Simple merge
A mirror of Linus' kernel repository