tree c9a431561f738d39a1a2c6dbed94af838f7d3b35
parent 9e0c6b1f47b7cd8e2ce542575573d7c235759ff9
parent 94091c6b9498116abe3035137d8c3e707528efd0
author Arnd Bergmann <arnd@arndb.de> 1352810882 +0100
committer Arnd Bergmann <arnd@arndb.de> 1352810882 +0100

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 <arnd@arndb.de>