linux-hardened/arch/arm/mach-shmobile
Linus Torvalds 0e51793e16 Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
Pull ARM updates from Russell King:
 "This is the first chunk of ARM updates for this merge window.
  Conflicts are expected in two files - asm/timex.h and
  mach-integrator/integrator_cp.c.  Nothing particularly stands out more
  than anything else.

  Most of the growth is down to the opcodes stuff from Dave Martin,
  which is countered by Rob's patches to use more of the asm-generic
  headers on ARM."

(A few more conflicts grew since then, but it all looked fairly trivial)

* 'for-linus' of git://git.linaro.org/people/rmk/linux-arm: (44 commits)
  ARM: 7548/1: include linux/sched.h in syscall.h
  ARM: 7541/1: Add ARM ERRATA 775420 workaround
  ARM: ensure vm_struct has its phys_addr member filled in
  ARM: 7540/1: kexec: Check segment memory addresses
  ARM: 7539/1: kexec: scan for dtb magic in segments
  ARM: 7538/1: delay: add registration mechanism for delay timer sources
  ARM: 7536/1: smp: Formalize an IPI for wakeup
  ARM: 7525/1: ptrace: use updated syscall number for syscall auditing
  ARM: 7524/1: support syscall tracing
  ARM: 7519/1: integrator: convert platform devices to Device Tree
  ARM: 7518/1: integrator: convert AMBA devices to device tree
  ARM: 7517/1: integrator: initial device tree support
  ARM: 7516/1: plat-versatile: add DT support to FPGA IRQ
  ARM: 7515/1: integrator: check PL010 base address from resource
  ARM: 7514/1: integrator: call common init function from machine
  ARM: 7522/1: arch_timers: register a time/cycle counter
  ARM: 7523/1: arch_timers: enable the use of the virtual timer
  ARM: 7531/1: mark kernelmode mem{cpy,set} non-experimental
  ARM: 7520/1: Build dtb files in all target
  ARM: Fix build warning in arch/arm/mm/alignment.c
  ...
2012-10-07 21:20:57 +09:00
..
include/mach Power management updates for 3.7-rc1 2012-10-02 18:32:35 -07:00
board-ag5evm.c Merge branch 'multiplatform/smp_ops' into next/multiplatform 2012-09-22 00:16:04 -07:00
board-ap4evb.c Power management updates for 3.7-rc1 2012-10-02 18:32:35 -07:00
board-armadillo800eva.c Power management updates for 3.7-rc1 2012-10-02 18:32:35 -07:00
board-bonito.c ARM: shmobile: use __iomem pointers for MMIO 2012-09-18 10:15:11 +02:00
board-g3evm.c ARM: shmobile: use __iomem pointers for MMIO 2012-09-18 10:15:11 +02:00
board-g4evm.c ARM: soc: multiplatform enablement 2012-10-01 19:11:38 -07: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 So this is the LW GPIO patch stack for v3.7: 2012-10-02 16:05:10 -07:00
board-mackerel.c Power management updates for 3.7-rc1 2012-10-02 18:32:35 -07:00
board-marzen.c ARM: soc: multiplatform enablement 2012-10-01 19:11:38 -07:00
clock-emev2.c mach-shmobile: Emma Mobile EV2 DT support V3 2012-05-18 00:14:03 +02:00
clock-r8a7740.c ARM: shmobile: use __iomem pointers for MMIO 2012-09-18 10:15:11 +02:00
clock-r8a7779.c r8a7779: add SDHI clock support 2012-09-06 10:49:18 +09:00
clock-sh73a0.c ARM: shmobile: use __iomem pointers for MMIO 2012-09-18 10:15:11 +02:00
clock-sh7367.c ARM: shmobile: use __iomem pointers for MMIO 2012-09-18 10:15:11 +02:00
clock-sh7372.c ARM: shmobile: use __iomem pointers for MMIO 2012-09-18 10:15:11 +02:00
clock-sh7377.c ARM: shmobile: use __iomem pointers for MMIO 2012-09-18 10:15:11 +02:00
clock.c ARM: mach-shmobile: rename clk_init() to shmobile_clk_init() 2012-03-12 22:19:43 +01:00
console.c
cpuidle.c ARM: shmobile: Make sh7372 cpuidle handling more straightforward 2012-09-04 01:45:01 +02:00
entry-intc.S ARM: gic: consolidate PPI handling 2011-10-23 13:32:29 +01:00
headsmp.S ARM / mach-shmobile: Invalidate caches when booting secondary cores 2012-05-12 22:13:52 +02:00
hotplug.c ARM: SoC: convert shmobile SMP to SMP operations 2012-09-14 11:14:58 +02:00
intc-r8a7740.c ARM: shmobile: r8a7740: add HDMI interrupt support 2012-06-20 12:27:47 +02:00
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-sh7367.c ARM: shmobile: remove NR_IRQS 2012-01-25 20:37:51 -06:00
intc-sh7372.c ARM: shmobile: use __iomem pointers for MMIO 2012-09-18 10:15:11 +02:00
intc-sh7377.c ARM: shmobile: remove NR_IRQS 2012-01-25 20:37:51 -06:00
Kconfig Merge branch 'renesas-armadillo' into renesas-board 2012-07-11 23:06:35 +02:00
Makefile ARM: shmobile: Move definition of shmobile_init_late() to header 2012-09-04 01:45:01 +02: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: move custom gpio functions to sh-gpio.h 2012-09-14 09:21:58 -05:00
pfc-sh73a0.c ARM: shmobile: move custom gpio functions to sh-gpio.h 2012-09-14 09:21:58 -05:00
pfc-sh7367.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
pfc-sh7377.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 ARM: shmobile: Move r8a7740's PM domain objects to a table 2012-09-04 01:44:57 +02:00
pm-r8a7779.c ARM: shmobile: Move r8a7779's PM domain objects to a table 2012-09-04 01:44:58 +02:00
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: Move r8a7740's PM domain objects to a table 2012-09-04 01:44:57 +02:00
setup-r8a7779.c ARM: shmobile: Move r8a7779's PM domain objects to a table 2012-09-04 01:44:58 +02:00
setup-sh73a0.c ARM: soc: soc-specific updates 2012-10-01 18:24:44 -07:00
setup-sh7367.c ARM: shmobile: use __iomem pointers for MMIO 2012-09-18 10:15:11 +02:00
setup-sh7372.c ARM: shmobile: Rework adding devices to PM domains on Mackerel 2012-09-04 01:45:00 +02:00
setup-sh7377.c ARM: shmobile: use __iomem pointers for MMIO 2012-09-18 10:15:11 +02:00
sh-gpio.h ARM: soc: multiplatform enablement 2012-10-01 19:11:38 -07:00
sleep-sh7372.S PM / shmobile: Add support for the sh7372 A4S power domain / sleep mode 2011-12-25 23:39:03 +01:00
smp-emev2.c Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 2012-10-07 21:20:57 +09:00
smp-r8a7779.c ARM: SoC: convert shmobile SMP to SMP operations 2012-09-14 11:14:58 +02:00
smp-sh73a0.c ARM: SoC: convert shmobile SMP to SMP operations 2012-09-14 11:14:58 +02:00
suspend.c ARM: shmobile: use machine specific hook for late init 2012-05-08 20:36:35 +08:00
timer.c ARM / mach-shmobile: Use preset_lpj with calibrate_delay() 2012-05-12 22:21:36 +02:00