• Arnd Bergmann's avatar
    Merge tag 'bcm63138-v4' of http://github.com/brcm/linux into next/soc · e1e85e76
    Arnd Bergmann authored
    Merge "ARM: BCM: Broadcom BCM63138 support" from Florian Fainelli:
    
    This patchset adds very minimal support for the BCM63138 SoC which is
    a xDSL SoC using a dual Cortex A9 CPU complex.
    
    * tag 'bcm63138-v4' of http://github.com/brcm/linux:
      MAINTAINERS: add entry for the Broadcom BCM63xx ARM SoCs
      ARM: BCM63XX: add BCM963138DVT Reference platform DTS
      ARM: BCM63XX: add BCM63138 minimal Device Tree
      ARM: BCM63XX: add low-level UART debug support
      ARM: BCM63XX: add basic support for the Broadcom BCM63138 DSL SoC
    
    Conflicts:
    	arch/arm/Kconfig.debug
    Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
    e1e85e76
Makefile 1.22 KB