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>

diff --cc arch/arm/mach-exynos/Makefile
Simple merge

diff --cc arch/arm/mach-exynos/clock.c
Simple merge

diff --cc arch/arm/mach-exynos/mach-nuri.c
Simple merge

diff --cc arch/arm/mach-exynos/mach-smdkv310.c
Simple merge

diff --cc arch/arm/mach-exynos/mach-universal_c210.c
Simple merge

diff --cc arch/arm/mach-s3c64xx/Makefile
index d7d9bb5,f37016c..1822ac2
--- 1/arch/arm/mach-s3c64xx/Makefile
--- 2/arch/arm/mach-s3c64xx/Makefile
+++ b/arch/arm/mach-s3c64xx/Makefile
@@@ -26,21 -27,21 +27,21 @@@ obj-$(CONFIG_PM)           += pm.o irq-pm.o slee
  
  obj-$(CONFIG_S3C64XX_DMA)     += dma.o
  
- # Device setup
+ # Device support
  
- obj-$(CONFIG_S3C64XX_SETUP_I2C0) += setup-i2c0.o
- obj-$(CONFIG_S3C64XX_SETUP_I2C1) += setup-i2c1.o
- obj-$(CONFIG_S3C64XX_SETUP_IDE) += setup-ide.o
- obj-$(CONFIG_S3C64XX_SETUP_KEYPAD) += setup-keypad.o
- obj-$(CONFIG_S3C64XX_SETUP_FB_24BPP) += setup-fb-24bpp.o
- obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o
- obj-$(CONFIG_S3C64XX_SETUP_SPI) += setup-spi.o
+ obj-y                         += dev-uart.o
+ obj-y                         += dev-audio.o
+ obj-$(CONFIG_S3C64XX_DEV_SPI) += dev-spi.o
  
- # PM
+ # Device setup
  
- obj-$(CONFIG_PM)              += pm.o
- obj-$(CONFIG_PM)              += sleep.o
- obj-$(CONFIG_PM)              += irq-pm.o
+ obj-$(CONFIG_S3C64XX_SETUP_FB_24BPP)  += setup-fb-24bpp.o
+ obj-$(CONFIG_S3C64XX_SETUP_I2C0)      += setup-i2c0.o
+ obj-$(CONFIG_S3C64XX_SETUP_I2C1)      += setup-i2c1.o
+ obj-$(CONFIG_S3C64XX_SETUP_IDE)               += setup-ide.o
+ obj-$(CONFIG_S3C64XX_SETUP_KEYPAD)    += setup-keypad.o
 -obj-$(CONFIG_S3C64XX_SETUP_SDHCI)     += setup-sdhci.o
+ obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO)        += setup-sdhci-gpio.o
++obj-$(CONFIG_S3C64XX_SETUP_SPI)               += setup-spi.o
  
  # Machine support
  

diff --cc arch/arm/mach-s3c64xx/clock.c
Simple merge

diff --cc arch/arm/mach-s5p64x0/Makefile
index a7d7a49,d3f7409..e167ca1
--- 1/arch/arm/mach-s5p64x0/Makefile
--- 2/arch/arm/mach-s5p64x0/Makefile
+++ b/arch/arm/mach-s5p64x0/Makefile
@@@ -26,7 -28,8 +28,8 @@@ obj-$(CONFIG_MACH_SMDK6450)   += mach-smd
  # device support
  
  obj-y                         += dev-audio.o
 -obj-$(CONFIG_S3C64XX_DEV_SPI) += dev-spi.o
  
+ obj-y                                 += setup-i2c0.o
  obj-$(CONFIG_S5P64X0_SETUP_I2C1)      += setup-i2c1.o
  obj-$(CONFIG_S5P64X0_SETUP_FB_24BPP)  += setup-fb-24bpp.o
 +obj-$(CONFIG_S5P64X0_SETUP_SPI)               += setup-spi.o

diff --cc arch/arm/mach-s5p64x0/clock-s5p6440.c
Simple merge

diff --cc arch/arm/mach-s5p64x0/clock-s5p6450.c
Simple merge

diff --cc arch/arm/mach-s5pc100/Makefile
index 291e246,c3166c4..118c711
--- 1/arch/arm/mach-s5pc100/Makefile
--- 2/arch/arm/mach-s5pc100/Makefile
+++ b/arch/arm/mach-s5pc100/Makefile
@@@ -32,4 -20,14 +20,13 @@@ obj-y                               += dma.
  obj-$(CONFIG_MACH_SMDKC100)   += mach-smdkc100.o
  
  # device support
+ 
  obj-y                         += dev-audio.o
 -obj-$(CONFIG_S3C64XX_DEV_SPI) += dev-spi.o
+ 
+ obj-y                                 += setup-i2c0.o
+ obj-$(CONFIG_S5PC100_SETUP_FB_24BPP)  += setup-fb-24bpp.o
+ obj-$(CONFIG_S5PC100_SETUP_I2C1)      += setup-i2c1.o
+ obj-$(CONFIG_S5PC100_SETUP_IDE)               += setup-ide.o
+ obj-$(CONFIG_S5PC100_SETUP_KEYPAD)    += setup-keypad.o
 -obj-$(CONFIG_S5PC100_SETUP_SDHCI)     += setup-sdhci.o
+ obj-$(CONFIG_S5PC100_SETUP_SDHCI_GPIO)        += setup-sdhci-gpio.o
++obj-$(CONFIG_S5PC100_SETUP_SPI)               += setup-spi.o

diff --cc arch/arm/mach-s5pc100/clock.c
Simple merge

diff --cc arch/arm/mach-s5pv210/Makefile
index 471df5d,4c59186..76a121d
--- 1/arch/arm/mach-s5pv210/Makefile
--- 2/arch/arm/mach-s5pv210/Makefile
+++ b/arch/arm/mach-s5pv210/Makefile
@@@ -27,12 -29,14 +29,13 @@@ obj-$(CONFIG_MACH_TORBRECK)        += mach-tor
  # device support
  
  obj-y                         += dev-audio.o
 -obj-$(CONFIG_S3C64XX_DEV_SPI) += dev-spi.o
  
+ obj-y                                 += setup-i2c0.o
  obj-$(CONFIG_S5PV210_SETUP_FB_24BPP)  += setup-fb-24bpp.o
  obj-$(CONFIG_S5PV210_SETUP_FIMC)      += setup-fimc.o
- obj-$(CONFIG_S5PV210_SETUP_I2C1)      += setup-i2c1.o
- obj-$(CONFIG_S5PV210_SETUP_I2C2)      += setup-i2c2.o
+ obj-$(CONFIG_S5PV210_SETUP_I2C1)      += setup-i2c1.o
+ obj-$(CONFIG_S5PV210_SETUP_I2C2)      += setup-i2c2.o
  obj-$(CONFIG_S5PV210_SETUP_IDE)               += setup-ide.o
  obj-$(CONFIG_S5PV210_SETUP_KEYPAD)    += setup-keypad.o
 -obj-$(CONFIG_S5PV210_SETUP_SDHCI)     += setup-sdhci.o
  obj-$(CONFIG_S5PV210_SETUP_SDHCI_GPIO)        += setup-sdhci-gpio.o
 +obj-$(CONFIG_S5PV210_SETUP_SPI)               += setup-spi.o

diff --cc arch/arm/mach-s5pv210/clock.c
Simple merge

diff --cc arch/arm/mach-s5pv210/mach-aquila.c
Simple merge

diff --cc arch/arm/mach-s5pv210/mach-goni.c
Simple merge

diff --cc arch/arm/mach-s5pv210/mach-smdkv210.c
Simple merge

diff --cc drivers/mmc/host/sdhci-s3c.c
Simple merge