]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'renesas/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 8 Oct 2012 02:08:54 +0000 (13:08 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 8 Oct 2012 02:08:54 +0000 (13:08 +1100)
commitf1f60babb627610ddd4540ce65a7fe363e9f778b
treeee460f3286a5cbdffef47b8ea6257421a5d0d869
parent56ade9ae6f33d19d426b6e4e7d72518d825d77ac
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