Merge branch 'brcm/stb-smp-uart' into next/drivers
This resolves a nonobvious merge conflict that I got wrong the first time. * brcm/stb-smp-uart: bus: brcmstb_gisb: save and restore GISB timeout bus: brcmstb_gisb: register the fault code hook ARM: brcmstb: Kconfig: drop unneeded symbol selections ARM: brcmstb: reintroduce SMP support ARM: brcmstb: add debug UART for earlyprintk support Conflicts: drivers/bus/brcmstb_gisb.c Signed-off-by:Arnd Bergmann <arnd@arndb.de> Reported-by:
Florian Fainelli <f.fainelli@gmail.com>
Showing
- arch/arm/Kconfig.debug 15 additions, 1 deletionarch/arm/Kconfig.debug
- arch/arm/mach-bcm/Kconfig 0 additions, 3 deletionsarch/arm/mach-bcm/Kconfig
- arch/arm/mach-bcm/Makefile 2 additions, 0 deletionsarch/arm/mach-bcm/Makefile
- arch/arm/mach-bcm/brcmstb.h 19 additions, 0 deletionsarch/arm/mach-bcm/brcmstb.h
- arch/arm/mach-bcm/headsmp-brcmstb.S 33 additions, 0 deletionsarch/arm/mach-bcm/headsmp-brcmstb.S
- arch/arm/mach-bcm/platsmp-brcmstb.c 329 additions, 0 deletionsarch/arm/mach-bcm/platsmp-brcmstb.c
- drivers/bus/brcmstb_gisb.c 41 additions, 6 deletionsdrivers/bus/brcmstb_gisb.c
Please register or sign in to comment