From: Arnd Bergmann Date: Tue, 13 Nov 2012 12:48:02 +0000 (+0100) Subject: Merge branch 'soc4' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=97b129be91bc978a205db24241840b95cfa28325;p=linux-beck.git Merge branch 'soc4' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc2 Its a little embarrassing, but they all fix problems introduced in previous pull-requests for 3.8 that have been merged. * The three Revert patches back-out secondary CPU initialisation changes from Bastian Hecht which he as advised me are incorrect and break secondary CPU initialisation. * The clkfwk patch from Morimoto-san resolves a build warning. * 'soc4' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: sh: clkfwk: fixup unsed variable warning Revert "ARM: shmobile: r8a7779: Replace modify_scu_cpu_psr with scu_power_mode" Revert "ARM: shmobile: sh73a0: Replace modify_scu_cpu_psr with scu_power_mode" Revert "ARM: shmobile: emev2: Replace modify_scu_cpu_psr with scu_power_mode" Signed-off-by: Arnd Bergmann --- 97b129be91bc978a205db24241840b95cfa28325