]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'renesas/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 2 Oct 2012 05:25:04 +0000 (15:25 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 2 Oct 2012 05:25:04 +0000 (15:25 +1000)
commita16d5971b4497f125a362ef584b8df2a3000d933
tree5c87459ecff15e86f4fa29b2a1a0c4e6e495a888
parent35d13987422eb169cd8f3339d57643d5c868d168
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