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

clock.c

ARM: 6483/1: arm & sh: factorised duplicated clkdev.c

2010-11-26 10:51:04 +00:00

clock.h

ARM: PNX4008: provide clock enable/disable methods and initialization

2010-02-12 17:32:36 +00:00

core.c

ARM: restart: pnx4008: use new restart hook

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

dma.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

gpio.c

ARM: 7057/1: mach-pnx4008: rename GPIO header

2011-08-23 15:30:04 +01:00

i2c.c

ARM: PNX4008: move i2c_adapter structure inside the drivers private data

2010-02-12 17:32:41 +00:00

irq.c

arm: Cleanup the irq namespace

2011-03-29 14:47:57 +02:00

Makefile

…

Makefile.boot

ARM: 7022/1: allow to detect conflicting zreladdrs

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

pm.c

suspend: constify platform_suspend_ops

2010-11-16 14:14:02 +01:00

serial.c

ARM: 7057/1: mach-pnx4008: rename GPIO header

2011-08-23 15:30:04 +01:00

sleep.S

…

time.c

ARM: PNX4008: remove platform definitions from mach/timex.h

2010-02-12 17:32:39 +00:00

time.h

ARM: PNX4008: remove platform definitions from mach/timex.h

2010-02-12 17:32:39 +00:00