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

fb.c

ARM: 6827/1: mach-netx: delete hardcoded periphid

2011-05-26 10:33:34 +01:00

fb.h

[ARM] 3572/1: netX: framebuffer driver for Hilscher netX

2006-06-19 13:30:58 +01:00

generic.c

ARM: restart: netx: use new restart hook

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

generic.h

ARM: restart: netx: use new restart hook

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

Kconfig

[ARM] 3576/1: netX: board support for NXEB500HMI development board

2006-06-19 15:29:45 +01:00

Makefile

Remove references to "make dep"

2008-01-28 23:22:13 +01:00

Makefile.boot

ARM: 7022/1: allow to detect conflicting zreladdrs

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

nxdb500.c

Merge branch 'restart' into for-linus

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

nxdkn.c

Merge branch 'restart' into for-linus

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

nxeb500hmi.c

Merge branch 'restart' into for-linus

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

pfifo.c

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

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

time.c

clocksource: convert ARM 32-bit up counting clocksources

2011-05-23 18:04:51 +01:00

xc.c

arm: Add export.h to ARM specific files as required.

2011-10-31 19:30:50 -04:00