Ben Dooks 6aeaad51aa ARM: Merge for-2635-4/watchdog ...

Merge branch 'for-2635-4/watchdog' into for-2635-4/partial2

Conflicts:
	arch/arm/mach-s3c64xx/mach-smdk6410.c
	arch/arm/mach-s5p6440/Kconfig
	arch/arm/mach-s5p6440/include/mach/map.h
	arch/arm/mach-s5p6440/mach-smdk6440.c
	arch/arm/mach-s5pv210/Kconfig
	arch/arm/mach-s5pv210/include/mach/map.h
	arch/arm/mach-s5pv210/mach-smdkv210.c

2010-05-20 19:51:40 +09:00

..

include/mach

ARM: Merge for-2635-4/watchdog

2010-05-20 19:51:40 +09:00

clock.c

ARM: S5P6440: Add clocks of type 'struct clksrc_clk'.

2010-05-13 10:42:48 +09:00

cpu.c

ARM: S5P6440: Add Touchscreen support for S5P6440

2010-05-20 14:15:21 +09:00

dev-audio.c

ARM: S5P6440: Add audio platform devices

2010-05-18 19:09:50 +09:00

dev-spi.c

ARM: S5P6440: Define SPI platform devices

2010-05-20 19:37:23 +09:00

dma.c

S5P6440: DMA: Add platform devices for PL330 DMACs

2010-05-18 18:00:12 +09:00

gpio.c

ARM: SAMSUNG: Add GPIO configuration read calls

2010-05-06 10:27:16 +09:00

init.c

ARM: S5P6440: Move CPU specific code in plat-s5p to machine directory

2010-01-27 09:50:11 +09:00

Kconfig

ARM: Merge for-2635-4/watchdog

2010-05-20 19:51:40 +09:00

mach-smdk6440.c

ARM: Merge for-2635-4/watchdog

2010-05-20 19:51:40 +09:00

Makefile

ARM: S5P6440: Define SPI platform devices

2010-05-20 19:37:23 +09:00

Makefile.boot

ARM: S5P6440: Add new Kconfig and Makefiles

2010-01-15 19:16:32 +09:00

setup-i2c0.c

ARM: SAMSUNG: Copy common I2C0 device helpers to machine directories

2010-05-19 18:16:04 +09:00