• Arnd Bergmann's avatar
    Merge tag 'arm-soc/for-3.19/cygnus-dts-v2' of http://github.com/brcm/linux into next/dt · 0924a425
    Arnd Bergmann authored
    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: default avatarArnd Bergmann <arnd@arndb.de>
    0924a425
Makefile 14.8 KB