Kukjin Kim c9312209aa Merge branch 'next/topic-dma-pl330-devname-fix' into next/topic-dma-samsung ...

Conflicts:
	arch/arm/mach-exynos4/clock.c
	arch/arm/mach-s5p64x0/clock-s5p6440.c
	arch/arm/mach-s5p64x0/clock-s5p6450.c
	arch/arm/mach-s5pc100/clock.c
	arch/arm/mach-s5pv210/clock.c

2011-09-19 10:30:49 +09:00

..

include/mach

ARM: S5PC100: Use generic DMA PL330 driver

2011-09-14 11:10:03 +05:30

clock.c

Merge branch 'next/topic-dma-pl330-devname-fix' into next/topic-dma-samsung

2011-09-19 10:30:49 +09:00

cpu.c

ARM: S5P: Moves initial map for merging S5P64X0

2010-10-18 10:33:34 +09:00

dev-audio.c

ASoC: Samsung: Rename AC97 platform device

2010-11-23 14:05:29 +00:00

dev-spi.c

Merge branch 'for-spi' into s5p-fixes-for-linus

2011-07-06 15:46:41 +09:00

dma.c

ARM: S5PC100: register the second instance of pl330 DMAC

2011-09-19 10:27:26 +09:00

init.c

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

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

Kconfig

ARM: S5PC100: Use generic DMA PL330 driver

2011-09-14 11:10:03 +05:30

mach-smdkc100.c

ARM: S5PC100: Cleanup mach/regs-fb.h from mach-s5pc100

2011-07-21 02:11:30 +09:00

Makefile

gpio: Move the s5pc100 GPIO to drivers/gpio

2011-05-26 17:33:41 -06:00

Makefile.boot

ARM: S5PC100: Kconfigs and Makefiles

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

setup-fb-24bpp.c

ARM: S5PC100: Cleanup mach/regs-fb.h from mach-s5pc100

2011-07-21 02:11:30 +09:00

setup-i2c0.c

ARM: S5PC100: 2nd Change to using s3c_gpio_cfgall_range()

2010-10-23 11:50:59 +09:00

setup-i2c1.c

ARM: S5PC100: 2nd Change to using s3c_gpio_cfgall_range()

2010-10-23 11:50:59 +09:00

setup-ide.c

ARM: S5PC100: 2nd Change to using s3c_gpio_cfgrange_nopull()

2010-10-23 11:52:15 +09:00

setup-keypad.c

ARM: S5PC100: 2nd Change to using s3c_gpio_cfgrange_nopull()

2010-10-23 11:52:15 +09:00

setup-sdhci-gpio.c

ARM: S5PC100: Change to using s3c_gpio_cfgrange_nopull()

2010-10-23 11:51:41 +09:00

setup-sdhci.c

Fix common misspellings

2011-03-31 11:26:23 -03:00