diff options
author | Olof Johansson <olof@lixom.net> | 2014-11-03 22:19:21 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-11-03 22:19:21 -0800 |
commit | 656b5def741af0379c4be81a5e298df27e66634d (patch) | |
tree | 7fa65f2341770b8e008add09115a5fe8c3a85620 /drivers/scsi/mpt3sas/mpi/mpi2_raid.h | |
parent | 9576d3e622f325e617b272172dd68e329e742f77 (diff) | |
parent | 203bb85ed605e43eadca62afb3a8cd128a8ec10a (diff) |
Merge tag 'brcmstb-smp-uart-for-3.19' of http://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 <olof@lixom.net>
Diffstat (limited to 'drivers/scsi/mpt3sas/mpi/mpi2_raid.h')
0 files changed, 0 insertions, 0 deletions