Russell King 7b9dd47136 Merge branch 'restart' into for-linus ...

Conflicts:
	arch/arm/mach-exynos/cpu.c

The changes to arch/arm/mach-exynos/cpu.c were moved to
mach-exynos/common.c.

2012-01-05 13:25:27 +00:00

..

include/mach

Merge branch 'restart' into for-linus

2012-01-05 13:25:27 +00:00

autcpu12.c

ARM: restart: clps711x: use new restart hook

2012-01-05 12:57:08 +00:00

cdb89712.c

ARM: restart: clps711x: use new restart hook

2012-01-05 12:57:08 +00:00

ceiva.c

ARM: restart: clps711x: use new restart hook

2012-01-05 12:57:08 +00:00

clep7312.c

ARM: restart: clps711x: use new restart hook

2012-01-05 12:57:08 +00:00

common.c

ARM: restart: clps711x: use new restart hook

2012-01-05 12:57:08 +00:00

common.h

ARM: restart: clps711x: use new restart hook

2012-01-05 12:57:08 +00:00

edb7211-arch.c

ARM: restart: clps711x: use new restart hook

2012-01-05 12:57:08 +00:00

edb7211-mm.c

[ARM] clps711x: fix warning in edb7211-mm.c

2009-01-08 16:29:42 +00:00

fortunet.c

ARM: restart: clps711x: use new restart hook

2012-01-05 12:57:08 +00:00

Kconfig

ARM: Remove DISCONTIGMEM support

2010-07-16 10:57:35 +01:00

Makefile

ARM: clps711x: consolidate irq/mm/time code into a single file

2011-11-17 17:09:30 +00:00

Makefile.boot

ARM: 7022/1: allow to detect conflicting zreladdrs

2011-10-17 09:12:40 +01:00

p720t-leds.c

[ARM] Convert asm/io.h to linux/io.h

2008-09-06 12:10:45 +01:00

p720t.c

ARM: restart: clps711x: use new restart hook

2012-01-05 12:57:08 +00:00