Arnd Bergmann a07613a54d Merge branch 'samsung/dt' into samsung/cleanup ...

Conflicts:
	arch/arm/mach-s3c64xx/Makefile
	arch/arm/mach-s5pc100/Makefile
	arch/arm/mach-s5pv210/Makefile

Pull in previously resolved conflicts:

The Makefiles were reorganized in the "rmk/restart" series and modified
in the "samsung/cleanup series". This also pulls in the other conflict
resolutions from the restart series against the samsung/dt series.

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

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

..

include/mach

Merge branch 'samsung/dt' into samsung/cleanup

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

clock.c

Merge branch 'samsung/dt' into samsung/cleanup

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

common.c

Merge branch 'depends/rmk/for-linus' into samsung/dt

2012-01-07 12:42:17 +00:00

common.h

ARM: 7252/1: restart: S5PV210: use new restart hook

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

dev-audio.c

ARM: SAMSUNG: Add IRQ_I2S0 definition

2011-07-21 17:27:28 +09:00

dma.c

ARM: S5PV210: Modify platform data for pl330 driver

2011-12-23 10:07:09 +09:00

Kconfig

ARM: S5PV210: Modified files for SPI consolidation work

2011-12-23 10:50:03 +09:00

mach-aquila.c

Merge branch 'samsung/dt' into samsung/cleanup

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

mach-goni.c

Merge branch 'samsung/dt' into samsung/cleanup

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

mach-smdkc110.c

Merge branch 'restart' into for-linus

2012-01-05 13:25:27 +00:00

mach-smdkv210.c

Merge branch 'samsung/dt' into samsung/cleanup

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

mach-torbreck.c

Merge branch 'restart' into for-linus

2012-01-05 13:25:27 +00: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

pm.c

ARM: S5PV210: Fix build warning

2011-08-19 20:57:35 +09:00

setup-fb-24bpp.c

ARM: S5PV210: Cleanup mach/regs-fb.h from mach-s5pv210

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

setup-fimc.c

ARM: S5P: Add platform helpers for camera GPIO configuration

2011-03-11 15:49:00 +09:00

setup-i2c0.c

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

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

setup-i2c1.c

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

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

setup-i2c2.c

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

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

setup-ide.c

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

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

setup-keypad.c

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

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

setup-sdhci-gpio.c

Fix common misspellings

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

setup-spi.c

ARM: S5PV210: Modified files for SPI consolidation work

2011-12-23 10:50:03 +09:00