Merge branch 'v3.11-next/s3c24xx-dt-2' into v3.11-next/dt-n-clk-audio

diff --combined arch/arm/boot/dts/Makefile
index f0895c581a89be8668a99db10e6873ae94be0cef,d5df15dc70092f05ac7427af49d3bb06f5f66e7d..56ffdde091fac1b203368c1bdc2af1c787ef5260
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -159,6 -159,7 +159,7 @@@ dtb-$(CONFIG_ARCH_U8500) += snowball.dt
        hrefprev60.dtb \
        hrefv60plus.dtb \
        ccu9540.dtb
+ dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb
  dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
        r8a7740-armadillo800eva.dtb \
        r8a7778-bockw.dtb \
@@@ -177,9 -178,7 +178,9 @@@ dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300-
        spear320-evb.dtb \
        spear320-hmi.dtb
  dtb-$(CONFIG_ARCH_SPEAR6XX)+= spear600-evb.dtb
 -dtb-$(CONFIG_ARCH_SUNXI) += sun4i-a10-cubieboard.dtb \
 +dtb-$(CONFIG_ARCH_SUNXI) += \
 +      sun4i-a10-cubieboard.dtb \
 +      sun4i-a10-mini-xplus.dtb \
        sun4i-a10-hackberry.dtb \
        sun5i-a13-olinuxino.dtb
  dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \