Kukjin Kim f2b7e3c54a Merge branch 'next-s5p' into for-next ...

Conflicts:
	arch/arm/mach-s5pv210/mach-aquila.c
	arch/arm/mach-s5pv210/mach-goni.c

2010-08-06 21:34:55 +09:00

..

include/mach

Merge branch 'next-s5p' into for-next

2010-08-06 21:34:55 +09:00

clock.c

ARM: S5PC100: cleanup hsmmc clock definitions

2010-08-05 18:30:51 +09:00

cpu.c

ARM: S5PC100: Add Touchscreen support.

2010-08-05 18:30:50 +09:00

dev-audio.c

ARM: S5PC100: Add audio platform devices

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

dev-spi.c

ARM: S5PC100: Define SPI platform devices

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

dma.c

ARM: S5PC100: Fixup merge problems

2010-05-23 16:27:04 +01:00

gpiolib.c

ARM: S5PC100: use common plat-s5p external interrupt code

2010-05-20 15:28:44 +09:00

init.c

ARM: SAMSUNG: move S5PC100 support from plat-s5pc1xx to plat-s5p framework

2010-05-20 15:28:32 +09:00

irq-gpio.c

ARM: S5PC100: Add support for gpio interrupt

2010-05-20 15:28:43 +09:00

Kconfig

ARM: S5PC100: Add RTC support for S5PC100

2010-08-05 18:30:51 +09:00

mach-smdkc100.c

Merge branch 'next-s5p' into for-next

2010-08-06 21:34:55 +09:00

Makefile

ARM: S5PC100: Add keypad device to the SMDKC100 board

2010-08-05 18:30:51 +09:00

Makefile.boot

ARM: S5PC100: Kconfigs and Makefiles

2009-08-16 23:35:19 +01:00

setup-fb-24bpp.c

ARM: S5PC100: Move frame buffer helpers from plat-s5pc1xx to mach-s5pc100

2010-05-19 18:23:27 +09:00

setup-i2c0.c

ARM: S5PC100: Move i2c helpers from plat-s5pc1xx to mach-s5pc100

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

setup-i2c1.c

ARM: S5PC100: Move i2c helpers from plat-s5pc1xx to mach-s5pc100

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

setup-ide.c

ARM: S5PC100: Add support for Compact Flash driver on SMDKC100

2010-08-05 18:30:50 +09:00

setup-keypad.c

ARM: S5PC100: Add keypad device to the SMDKC100 board

2010-08-05 18:30:51 +09:00

setup-sdhci-gpio.c

ARM: S5PC100: Move sdhci helpers from plat-s5pc1xx to mach-s5pc100

2010-05-20 15:28:08 +09:00

setup-sdhci.c

ARM: S5PC100: cleanup hsmmc clock definitions

2010-08-05 18:30:51 +09:00