From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 19 May 2014 00:45:29 +0000 (+1000)
Subject: Merge remote-tracking branch 'berlin/berlin/for-next'
X-Git-Tag: next-20140519~111
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9cb461896506d38d1392e427512888d6c5808e5f;p=karo-tx-linux.git

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

9cb461896506d38d1392e427512888d6c5808e5f
diff --cc arch/arm/boot/dts/Makefile
index b0fcbb7545fa,076cc309b73f..09942db5eb0b
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -51,12 -51,14 +51,13 @@@ dtb-$(CONFIG_ARCH_AT91)	+= sama5d36ek.d
  
  dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb
  dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
 +dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb
  dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm28155-ap.dtb \
  	bcm21664-garnet.dtb
 -dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
 -dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb
  dtb-$(CONFIG_ARCH_BERLIN) += \
  	berlin2-sony-nsz-gs7.dtb	\
- 	berlin2cd-google-chromecast.dtb
+ 	berlin2cd-google-chromecast.dtb	\
+ 	berlin2q-marvell-dmp.dtb
  dtb-$(CONFIG_ARCH_DAVINCI) += da850-enbw-cmc.dtb \
  	da850-evm.dtb
  dtb-$(CONFIG_ARCH_EFM32) += efm32gg-dk3750.dtb