From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 15 Dec 2015 23:04:26 +0000 (+0100)
Subject: Merge tag 'realview-base-armsoc-2-tag' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8ea1c981b6303904a2d92102f903843bda9df58c;p=linux-beck.git

Merge tag 'realview-base-armsoc-2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/dt

Merge "Realview DT files" from Linus Walleij:

The device tree changes for the continued RealView DT
support.

* tag 'realview-base-armsoc-2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
  ARM: realview: add device tree for PB11MPCore
  clk: add ARM syscon ICST device tree bindings
  ARM: add DT bindings for the ARM11MPCore CPU cluster
---

8ea1c981b6303904a2d92102f903843bda9df58c
diff --cc arch/arm/boot/dts/Makefile
index d6bdf1ff12f1,e66743bb3bff..ceb3c559b78a
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -519,9 -510,9 +519,10 @@@ dtb-$(CONFIG_ARCH_QCOM) += 
  	qcom-msm8960-cdp.dtb \
  	qcom-msm8974-sony-xperia-honami.dtb
  dtb-$(CONFIG_ARCH_REALVIEW) += \
- 	arm-realview-pb1176.dtb
+ 	arm-realview-pb1176.dtb \
+ 	arm-realview-pb11mp.dtb
  dtb-$(CONFIG_ARCH_ROCKCHIP) += \
 +	rk3036-evb.dtb \
  	rk3066a-bqcurie2.dtb \
  	rk3066a-marsboard.dtb \
  	rk3066a-rayeager.dtb \