]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'renesas/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 15 Oct 2012 00:59:19 +0000 (11:59 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 15 Oct 2012 00:59:19 +0000 (11:59 +1100)
commit70fbee95206d5c68192b699881d267edb13b71fd
tree00e6f02843232309eb4e228ef0af6744b3d77895
parente3a647ef28e5ab1b574e63edcf1c164a7b8a2387
parentab48623afc7486f39f888d644bd6576bedaeca7d
Merge remote-tracking branch 'renesas/next'

Conflicts:
arch/arm/Kconfig
arch/arm/Kconfig
arch/arm/mach-shmobile/board-armadillo800eva.c
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