tree 02be307efe587f8eefebaf06b81dd2538b9fa504
parent 6b34df9e30c8b596f9d0173ca17714076474458e
parent 203bb85ed605e43eadca62afb3a8cd128a8ec10a
author Arnd Bergmann <arnd@arndb.de> 1418055363 +0100
committer Arnd Bergmann <arnd@arndb.de> 1418055386 +0100

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>