Merge tag 'arm-soc/for-3.19/cygnus-dts-v2' of http://github.com/brcm/linux into next/dt

Pull "Broadcom Cygnus SoC Device Tree changes" from  Florian Fainelli:

This pull request contains the Broadcom Cygnus Device Tree changes:

- binding documentation for the SoC and clock
- cygnus SoC and clock dtsi files
- DTS for Cygnus Entreprise phone, BCM911360K and BCM958300K

* tag 'arm-soc/for-3.19/cygnus-dts-v2' of http://github.com/brcm/linux:
  ARM: dts: Enable Broadcom Cygnus SoC
  dt-bindings: Document Broadcom Cygnus SoC and clocks

[arnd: something went wrong here, we already had pulled an earlier
 version of the same patches, which had the wrong license statement.
 I've pulled this one over the old pull request and fixed up the
 conflicts now]

Conflicts:
	arch/arm/boot/dts/bcm-cygnus-clock.dtsi
	arch/arm/boot/dts/bcm-cygnus.dtsi
	arch/arm/boot/dts/bcm911360_entphn.dts
	arch/arm/boot/dts/bcm911360k.dts
	arch/arm/boot/dts/bcm958300k.dts

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc arch/arm/boot/dts/Makefile
index 165a6add38b9fbd0da4cd73d684a2f668799ff17,9063142f4d87305b8827819493eac18747e2349d..bbce4f4341780f3dae2b3957e4757b5c12b605ac
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -54,13 -54,11 +54,12 @@@ dtb-$(CONFIG_ARCH_AT91)    += at91-sama5d4
  dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb
  dtb-$(CONFIG_ARCH_AXXIA) += axm5516-amarillo.dtb
  dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
- dtb-$(CONFIG_ARCH_BCM_CYGNUS) += \
-       bcm911360_entphn.dtb \
-       bcm911360k.dtb \
-       bcm958300k.dtb
 +dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b-plus.dtb
  dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb
  dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb
+ dtb-$(CONFIG_ARCH_BCM_CYGNUS) += bcm911360_entphn.dtb \
+       bcm911360k.dtb \
+       bcm958300k.dtb
  dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm28155-ap.dtb \
        bcm21664-garnet.dtb
  dtb-$(CONFIG_ARCH_BERLIN) += \