projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c58181e cf1e8f0)
Merge branch 'qcom/cleanup' into next/dt
authorArnd Bergmann <arnd@arndb.de>
Fri, 28 Feb 2014 15:10:19 +0000 (16:10 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 28 Feb 2014 15:10:19 +0000 (16:10 +0100)
This is a dependency for the qcom/dt branch.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
arch/arm/boot/dts/Makefile patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/boot/dts/Makefile
index 94b3bb4,c9eaf1f..ec23402
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -120,14 -115,9 +120,11 @@@ 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-apq8074-dragonboard.dtb
  dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
        armada-370-mirabox.dtb \
        armada-370-netgear-rn102.dtb \
Domain: System / Kernel;