Merge remote-tracking branch 'mvebu/for-next'

diff --cc arch/arm/boot/dts/Makefile
index f676ee96b5e470d5604177b82c5caa95d1abe001,cf854bd0d069cc3ff39f93e8cd259a15dba8e06d..aeb80538a7b611b35724cbe034c06c408f0c6184
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -115,12 -105,12 +116,14 @@@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood
        kirkwood-sheevaplug-esata.dtb \
        kirkwood-topkick.dtb \
        kirkwood-ts219-6281.dtb \
-       kirkwood-ts219-6282.dtb
+       kirkwood-ts219-6282.dtb \
+       kirkwood-ts419-6281.dtb \
+       kirkwood-ts419-6282.dtb
  dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb
 +dtb-$(CONFIG_ARCH_MOXART) += moxart-uc7112lx.dtb
  dtb-$(CONFIG_ARCH_MSM) += qcom-msm8660-surf.dtb \
 -      qcom-msm8960-cdp.dtb
 +      qcom-msm8960-cdp.dtb \
 +      qcom-apq8074-dragonboard.dtb
  dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
        armada-370-mirabox.dtb \
        armada-370-netgear-rn102.dtb \

diff --cc drivers/irqchip/Makefile
Simple merge