Arnd Bergmann 0dc488e778 Merge branch 'samsung/exynos-multiplatform' into next/drivers ...

Merging this into the next/drivers branch avoids a number of
pointless conflicts with code changed here.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

2013-04-19 16:50:56 +02:00

..

include/mach

ARM: exynos: move debug-macro.S to include/debug/

2013-04-19 13:51:21 +02:00

clock.c

ARM: S5PC100: Add I2S clkdev support

2012-12-19 09:49:29 -08:00

common.c

ARM: SAMSUNG: Add naming of s3c64xx-spi devices

2012-10-17 16:47:32 +09:00

common.h

ARM: 7251/1: restart: S5PC100: use new restart hook

2012-01-05 12:57:19 +00:00

dev-audio.c

ARM: S5PC100: Add I2S clkdev support

2012-12-19 09:49:29 -08:00

dma.c

ARM: S5PC100: Remove unused variable in dma.c file

2012-06-20 09:14:53 +09:00

Kconfig

ARM: S5PC100: Add samsung-time support for s5pc100

2013-03-05 20:19:54 +09:00

mach-smdkc100.c

ARM: S5PC100: Add samsung-time support for s5pc100

2013-03-05 20:19:54 +09:00

Makefile

Merge branch 'samsung/dt' into samsung/cleanup

2012-01-09 16:01:00 +00:00

Makefile.boot

ARM: 7022/1: allow to detect conflicting zreladdrs

2011-10-17 09:12:40 +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: samsung: move platform_data definitions

2012-09-19 17:42:18 +02:00

setup-i2c1.c

ARM: samsung: move platform_data definitions

2012-09-19 17:42:18 +02: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

mmc: sdhci-s3c: remove platform dependencies

2013-04-19 13:51:23 +02:00

setup-spi.c

ARM: SAMSUNG: Remove pdev pointer parameter from spi gpio setup functions

2012-07-13 15:23:46 +09:00