Arnd Bergmann 928a11ba36 Merge branch 'next/cleanup' into samsung/dt ... Conflicts: arch/arm/mach-exynos/common.c The common.c file gets changes from rmk/stable-devel (part of next/cleanup), rmk/restart, samsung/dt and follow-on branches from the samsung tree. Pulling it all together here hopefully avoids having to do even more conflicting merge changesets in this one file. What a mess! Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-01-07 20:23:00 +00:00
..
include/mach	Merge branch 'depends/rmk/restart' into next/cleanup	2012-01-07 11:51:28 +00:00
common.c	ARM: picoxcell: move io mappings to common.c	2011-12-18 10:48:20 +00:00
common.h	ARM: picoxcell: move io mappings to common.c	2011-12-18 10:48:20 +00:00
Makefile	ARM: picoxcell: move io mappings to common.c	2011-12-18 10:48:20 +00:00
Makefile.boot	picoxcell: support for Picochip picoxcell devices	2011-09-26 16:11:56 +01:00
time.c	ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime	2011-12-18 23:00:26 +00:00