2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-20 19:23:57 +08:00
linux-next/drivers/sh
Arnd Bergmann 97b129be91 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>
2012-11-13 13:48:02 +01:00
..
clk sh: clkfwk: fixup unsed variable warning 2012-11-13 11:45:40 +09:00
intc sh: Fix up more fallout from pointless ARM __iomem churn. 2012-10-15 14:08:48 +09:00
maple sh: Add module.h to arch/sh specific files as required. 2011-10-31 19:31:04 -04:00
pfc ARM: soc: multiplatform enablement 2012-10-01 19:11:38 -07:00
superhyway sh: struct device - replace bus_id with dev_name(), dev_set_name() 2009-03-24 16:38:21 -07:00
Kconfig sh: pfc: Shuffle PFC support core. 2012-07-10 11:49:30 +09:00
Makefile sh: pfc: Shuffle PFC support core. 2012-07-10 11:49:30 +09:00
pm_runtime.c drivers: sh: Kill off dead pathname for runtime PM stub. 2011-11-11 15:58:50 +09:00