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-s5p6440.c

ARM: S5P64X0: move s5p64x0-clock.h into local directory

2013-01-10 10:45:17 -08:00

clock-s5p6450.c

ARM: S5P64X0: move s5p64x0-clock.h into local directory

2013-01-10 10:45:17 -08:00

clock.c

ARM: S5P64X0: use static declaration when it is not used in other files

2012-01-21 13:06:10 +09:00

clock.h

ARM: S5P64X0: move s5p64x0-clock.h into local directory

2013-01-10 10:45:17 -08:00

common.c

ARM: samsung: remove obsoleted init_consistent_dma_size()

2012-11-13 10:13:12 +01:00

common.h

ARM: 7250/1: restart: S5P64X0: use new restart hook

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

dev-audio.c

ARM: S5P64X0: Add I2S clkdev support

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

dma.c

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

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

i2c.h

ARM: S5P64X0: move i2c.h into local directory

2013-01-10 10:45:16 -08:00

irq-pm.c

ARM: S5P64X0: Add Power Management support

2011-10-04 20:31:24 +09:00

Kconfig

ARM: SAMSUNG: Rename s5p-time to samsung-time

2013-03-05 20:15:55 +09:00

mach-smdk6440.c

ARM: SAMSUNG: Rename s5p-time to samsung-time

2013-03-05 20:15:55 +09:00

mach-smdk6450.c

ARM: SAMSUNG: Rename s5p-time to samsung-time

2013-03-05 20:15:55 +09:00

Makefile

Merge branch 'samsung/cleanup' into samsung/driver

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

Makefile.boot

ARM: 7022/1: allow to detect conflicting zreladdrs

2011-10-17 09:12:40 +01:00

pm.c

ARM: SAMSUNG: Gracefully exit on suspend failure

2013-01-30 22:28:05 -08:00

setup-fb-24bpp.c

ARM: S5P64X0: Add GPIO setup for LCD

2011-10-04 19:00:53 +09:00

setup-i2c0.c

ARM: S5P64X0: move i2c.h into local directory

2013-01-10 10:45:16 -08:00

setup-i2c1.c

ARM: S5P64X0: move i2c.h into local directory

2013-01-10 10:45:16 -08:00

setup-sdhci-gpio.c

ARM: S5P64X0: Add HSMMC setup for host Controller

2011-12-26 16:30:43 +09:00

setup-spi.c

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

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