Arnd Bergmann 142f2101a8 Merge branch 'samsung/cleanup' into samsung/driver ...

Conflicts:
	arch/arm/mach-s5p64x0/cpu.c -> common.c

More changes to a file that got moved into common.c,
see previous conflict resolutions.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

2012-01-09 16:14:07 +00:00

..

include/plat

Merge branch 'samsung/cleanup' into samsung/driver

2012-01-09 16:14:07 +00:00

adc.c

…

clock-clksrc.c

…

clock.c

…

cpu.c

…

dev-backlight.c

ARM: SAMSUNG: remove duplicated header include

2011-12-08 10:09:29 +09:00

dev-uart.c

…

devs.c

ARM: S5PC100: Modified files for SPI consolidation work

2011-12-23 10:50:01 +09:00

dma-ops.c

ARM: SAMSUNG: Add device tree support for pl330 dma engine wrappers

2011-12-23 10:07:05 +09:00

dma.c

…

init.c

…

irq-vic-timer.c

…

Kconfig

ARM: SAMSUNG: Consolidation of SPI platform devices to plat-samsung

2011-12-23 10:49:53 +09:00

Makefile

…

pd.c

…

platformdata.c

…

pm-check.c

…

pm-gpio.c

…

pm.c

…

pwm-clock.c

…

pwm.c

…

s3c-dma-ops.c

…

time.c

…

wakeup-mask.c

…