Kukjin Kim d61bd77ff1 Merge branch 'next-samsung' into for-next ...

Conflicts:
	arch/arm/mach-s5p6440/Kconfig
	arch/arm/mach-s5p6442/Kconfig
	arch/arm/mach-s5pc100/Kconfig
	arch/arm/mach-s5pv210/Kconfig
	arch/arm/mach-s5pv210/cpu.c
	arch/arm/plat-samsung/include/plat/sdhci.h

2010-08-06 21:49:18 +09:00

..

include/mach

Merge branch 'next-s5p' into for-next

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

clock.c

ARM: S5P6442: Add Watchdog support for S5P6442

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

cpu.c

ARM: SAMSUNG: Remove static of S5P SoCs sysclass

2010-05-12 11:15:09 +09:00

dev-audio.c

ARM: SAMSUNG: Fix on inclusion mach/gpio.h for Samsung SoCs

2010-08-06 21:28:44 +09:00

dev-spi.c

ARM: SAMSUNG: Fix on inclusion mach/gpio.h for Samsung SoCs

2010-08-06 21:28:44 +09:00

dma.c

S5P6442: DMA: Add platform devices for PL330 DMACs

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

init.c

…

Kconfig

ARM: SAMSUNG: Make WDT driver dependency SoC specific instead of machine specific

2010-08-06 21:26:56 +09:00

mach-smdk6442.c

Merge branch 'next-s5p' into for-next

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

Makefile

ARM: S5P6442: Define SPI platform devices

2010-05-20 19:34:01 +09:00

Makefile.boot

…

setup-i2c0.c

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

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