]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'renesas/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Oct 2012 02:50:16 +0000 (13:50 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Oct 2012 02:50:16 +0000 (13:50 +1100)
commitddced6fc710e8202c306376137590abfd20bbba6
tree35086b9122659c1d1aa454fe9069f4552a652df9
parent7b73323ab8b679ecb2d1540325fdfb28a6292aa4
parentb6812736c3053a2ee4cd6eadd4175e3c7044e428
Merge remote-tracking branch 'renesas/next'

Conflicts:
arch/arm/Kconfig
arch/arm/Kconfig
arch/arm/mach-shmobile/board-kzm9g.c
arch/arm/mach-shmobile/include/mach/sh7372.h
arch/arm/mach-shmobile/setup-r8a7740.c
arch/arm/mach-shmobile/setup-sh7372.c