Arnd Bergmann b2f1df8d2f Merge branch 'renesas/timer' into next/timer ... Conflicts: arch/arm/mach-shmobile/timer.c This resolves a nonobvious merge conflict between renesas timer changes in the global timer changes with those from the renesas soc branch and last minute bug fixes that went into v3.3. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-03-20 09:41:43 +00:00
..
include/mach	ARM: vexpress: Get rid of MMIO_P2V	2012-02-23 15:09:42 +00:00
core.h	ARM: vexpress: Get rid of MMIO_P2V	2012-02-23 15:09:42 +00:00
ct-ca9x4.c	ARM: plat-versatile: convert to twd_local_timer_register() interface	2012-03-13 13:29:58 +00:00
hotplug.c	ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP	2012-01-23 10:20:05 +00:00
Kconfig	ARM: 7346/1: errata: fix PL310 erratum #753970 workaround selection	2012-02-27 11:22:38 +00:00
Makefile	ARM: realview/vexpress: consolidate SMP bringup code	2011-02-19 11:11:41 +00:00
Makefile.boot	ARM: 7022/1: allow to detect conflicting zreladdrs	2011-10-17 09:12:40 +01:00
platsmp.c	ARM: vexpress: Get rid of MMIO_P2V	2012-02-23 15:09:42 +00:00
v2m.c	ARM: vexpress: Get rid of MMIO_P2V	2012-02-23 15:09:42 +00:00