Arnd Bergmann 2cbe23e3a4 Merge branch 'tegra/cleanups' into next/timer ... Conflicts: arch/arm/mach-tegra/Makefile arch/arm/mach-vexpress/core.h The tegra Makefile was changed in four different branches in the same line. This merge should reduce the amount of churn. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-03-21 14:27:34 +00:00
..
include/mach	Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc	2012-02-22 22:04:41 +00:00
clock.c
core.h	ARM: restart: highbank: use new restart hook	2012-01-05 12:57:12 +00:00
highbank.c	ARM: highbank: convert to twd_local_timer_register() interface	2012-03-13 13:45:52 +00:00
hotplug.c	ARM: highbank: Add cpu hotplug support	2011-10-31 14:14:04 +01:00
lluart.c
Makefile	ARM: highbank: convert to twd_local_timer_register() interface	2012-03-13 13:45:52 +00:00
Makefile.boot
platsmp.c
pm.c	ARM: highbank: add suspend support	2011-10-31 14:14:05 +01:00
sysregs.h
system.c	ARM: restart: highbank: use new restart hook	2012-01-05 12:57:12 +00:00