Ben Dooks 206a1a825d ARM: Merge for-2635-4/onenand ...

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

Conflicts:
	arch/arm/mach-s5pc100/cpu.c
	arch/arm/mach-s5pc100/include/mach/map.h
	arch/arm/mach-s5pv210/Makefile

2010-05-20 20:25:59 +09:00

..

include/mach

ARM: Merge for-2635-4/onenand

2010-05-20 20:25:59 +09:00

clock.c

ARM: S5PV210: Add sclk clocks of type 'struct clksrc_clk' clock

2010-05-17 10:37:39 +09:00

cpu.c

ARM: Merge for-2635-4/s5pv210-boards

2010-05-20 18:55:32 +09:00

dev-audio.c

ARM: S5PV210: Add audio platform devices

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

dev-onenand.c

ARM: SAMSUNG: Add platform support code for OneNAND controller

2010-05-20 17:48:36 +09:00

dev-spi.c

ARM: S5PV210: Define SPI platform devices

2010-05-20 19:31:10 +09:00

dma.c

S5PV210: DMA: Add platform devices for PL330 DMACs

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

gpiolib.c

ARM: S5PV210: Add GPIOlib support

2010-05-19 18:03:47 +09:00

init.c

ARM: S5PV210: Add Samsung S5PV210 CPU support

2010-02-24 22:47:21 +00:00

Kconfig

ARM: Merge for-2635-4/onenand

2010-05-20 20:25:59 +09:00

mach-aquila.c

ARM: S5PV210: add support for s3c-fb driver on Aquila machine

2010-05-20 15:09:38 +09:00

mach-goni.c

ARM: S5PV210: Add GONI board support

2010-05-20 18:47:34 +09:00

mach-smdkc110.c

ARM: S5PV210: Add Watchdog support for S5PV210

2010-05-20 19:47:32 +09:00

mach-smdkv210.c

ARM: Merge for-2635-4/watchdog

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

Makefile

ARM: Merge for-2635-4/onenand

2010-05-20 20:25:59 +09:00

Makefile.boot

ARM: S5PV210: Add Samsung S5PV210 CPU support

2010-02-24 22:47:21 +00:00

setup-fb-24bpp.c

ARM: S5PV210: add framebuffer platform helpers for s5pv210 based machines

2010-05-20 18:14:52 +09:00

setup-i2c0.c

ARM: S5PV210: add common I2C device helpers

2010-05-20 18:21:34 +09:00

setup-i2c1.c

ARM: S5PV210: add common I2C device helpers

2010-05-20 18:21:34 +09:00

setup-i2c2.c

ARM: S5PV210: add common I2C device helpers

2010-05-20 18:21:34 +09:00

setup-sdhci-gpio.c

ARM: S5PV210: add common HSMMC device helpers

2010-05-20 18:24:03 +09:00

setup-sdhci.c

ARM: S5PV210: add common HSMMC device helpers

2010-05-20 18:24:03 +09:00