alistair23-linux/arch/arm/mach-shmobile
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
..
include/mach ARM: shmobile: sh7372: sh7372_fsiXck_clk become non-global 2012-11-08 17:52:35 +09:00
board-ag5evm.c Merge branch 'multiplatform/smp_ops' into next/multiplatform 2012-09-22 00:16:04 -07:00
board-ap4evb.c ARM: shmobile: use FSI driver's audio clock on ap4evb 2012-11-08 17:52:05 +09:00
board-armadillo800eva.c Merge branch 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards2 2012-11-12 21:59:38 +01:00
board-bonito.c ARM: shmobile: use __iomem pointers for MMIO 2012-09-18 10:15:11 +02:00
board-kota2.c ARM: SoC: convert shmobile SMP to SMP operations 2012-09-14 11:14:58 +02:00
board-kzm9d.c ARM: SoC: convert shmobile SMP to SMP operations 2012-09-14 11:14:58 +02:00
board-kzm9g.c ARM: shmobile: kzm9g: enable DMAEngine on SHDI0 and SDHI2 2012-10-30 15:21:12 +08:00
board-mackerel.c Merge branches 'depends/asoc', 'renesas/boards', 'renesas/soc' and 'renesas/soc2' into next/boards2 2012-11-12 21:59:00 +01:00
board-marzen.c ARM: shmobile: marzen: add USB OHCI driver support 2012-11-08 17:52:04 +09:00
clock-emev2.c
clock-r8a7740.c ARM: shmobile: add fsi external clock on r8a7740 2012-11-08 15:22:01 +09:00
clock-r8a7779.c Merge branches 'depends/asoc', 'renesas/boards', 'renesas/soc' and 'renesas/soc2' into next/boards2 2012-11-12 21:59:00 +01:00
clock-sh73a0.c ARM: shmobile: use __iomem pointers for MMIO 2012-09-18 10:15:11 +02:00
clock-sh7372.c ARM: shmobile: sh7372: sh7372_fsiXck_clk become non-global 2012-11-08 17:52:35 +09:00
clock.c
console.c
cpuidle.c
entry-intc.S
headsmp.S
hotplug.c ARM: SoC: convert shmobile SMP to SMP operations 2012-09-14 11:14:58 +02:00
intc-r8a7740.c
intc-r8a7779.c ARM: shmobile: use __iomem pointers for MMIO 2012-09-18 10:15:11 +02:00
intc-sh73a0.c Merge branch 'cleanup/__iomem' into next/cleanup 2012-09-22 10:24:29 -07:00
intc-sh7372.c ARM: shmobile: use __iomem pointers for MMIO 2012-09-18 10:15:11 +02:00
Kconfig Merge branches 'depends/asoc', 'renesas/boards' and 'renesas/soc' into next/boards2 2012-11-12 21:57:52 +01:00
Makefile Merge branches 'depends/asoc', 'renesas/boards' and 'renesas/soc' into next/boards2 2012-11-12 21:57:52 +01:00
Makefile.boot ARM: dtb: move all dtb targets to common Makefile 2012-09-20 22:58:17 -07:00
pfc-r8a7740.c ARM: shmobile: move custom gpio functions to sh-gpio.h 2012-09-14 09:21:58 -05:00
pfc-r8a7779.c ARM: shmobile: r8a7779: PFC rename PENCx -> USB_PENCx 2012-11-07 17:11:22 +09:00
pfc-sh73a0.c ARM: shmobile: move custom gpio functions to sh-gpio.h 2012-09-14 09:21:58 -05:00
pfc-sh7372.c ARM: shmobile: move custom gpio functions to sh-gpio.h 2012-09-14 09:21:58 -05:00
platsmp.c ARM: SoC: convert shmobile SMP to SMP operations 2012-09-14 11:14:58 +02:00
pm-r8a7740.c
pm-r8a7779.c
pm-rmobile.c Power management updates for 3.7-rc1 2012-10-02 18:32:35 -07:00
pm-sh7372.c Power management updates for 3.7-rc1 2012-10-02 18:32:35 -07:00
setup-emev2.c Merge branch 'multiplatform/smp_ops' into next/multiplatform 2012-09-22 00:16:04 -07:00
setup-r8a7740.c ARM: shmobile: r8a7740: Enable PMU 2012-11-06 13:47:24 +09:00
setup-r8a7779.c Merge branches 'depends/asoc', 'renesas/boards' and 'renesas/soc' into next/boards2 2012-11-12 21:57:52 +01:00
setup-sh73a0.c ARM: soc: soc-specific updates 2012-10-01 18:24:44 -07:00
setup-sh7372.c ARM: mach-shmobile: add FLCTL DMA slave definitions for sh7372 2012-11-06 13:47:23 +09:00
sh-gpio.h ARM: soc: multiplatform enablement 2012-10-01 19:11:38 -07:00
sleep-sh7372.S
smp-emev2.c Revert "ARM: shmobile: emev2: Replace modify_scu_cpu_psr with scu_power_mode" 2012-11-13 11:41:09 +09:00
smp-r8a7779.c Revert "ARM: shmobile: r8a7779: Replace modify_scu_cpu_psr with scu_power_mode" 2012-11-13 11:42:54 +09:00
smp-sh73a0.c Revert "ARM: shmobile: sh73a0: Replace modify_scu_cpu_psr with scu_power_mode" 2012-11-13 11:42:28 +09:00
suspend.c
timer.c