From: Olof Johansson Date: Tue, 4 Nov 2014 06:19:21 +0000 (-0800) Subject: Merge tag 'brcmstb-smp-uart-for-3.19' of http://github.com/brcm/linux into next/soc X-Git-Tag: v3.19-rc1~169^2~35 X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=656b5def741af0379c4be81a5e298df27e66634d Merge tag 'brcmstb-smp-uart-for-3.19' of github.com/brcm/linux into next/soc Merge "ARM: brcmstb: SMP, Kconfig, earlyprintk and GISB fixes" from Florian Fainelli: This pull request contains 3 changes for the brcmstb platform and 2 changes to the GISB bus arbiter driver - fist patch adds earlyprintk to brcmstb platforms using the existing 8250 infrastructure - second patch re-introduces SMP support after fixing the problems we had in the initial implementation, for this patch to apply cleanly, I had to advance up to "ARM: brcmstb: revert SMP support" - third patch is dropping unused Kconfig dependencies - fourth patch registers the ARM fault code for external aborts that the GISB bus arbiter driver is designed to assit - fifth patch does save/restore the GISB arbiter timeout across S3 suspend/resume cycles Thanks! * tag 'brcmstb-smp-uart-for-3.19' of http://github.com/brcm/linux: 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 Signed-off-by: Olof Johansson --- 656b5def741af0379c4be81a5e298df27e66634d