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

…

cpu.c

ARM: SAMSUNG: Implement set_name function for ADC devices

2010-08-05 18:32:50 +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

…

gpio.c

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

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

init.c

…

Kconfig

Merge branch 'next-samsung' into for-next

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

mach-smdk6440.c

Merge branch 'next-s5p' into for-next

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

Makefile

ARM: S5P6440: Add support for I2C channel 0 and 1 on SMDK6440

2010-08-06 19:32:43 +09:00

Makefile.boot

…

setup-i2c0.c

ARM: S5P6440: Add support for I2C channel 0 and 1 on SMDK6440

2010-08-06 19:32:43 +09:00

setup-i2c1.c

ARM: S5P6440: Add support for I2C channel 0 and 1 on SMDK6440

2010-08-06 19:32:43 +09:00