diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2014-12-08 17:16:03 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-12-08 17:16:26 +0100 |
| commit | 7135466151f0560604c2bfc4c27ff9cc2a40f8cd (patch) | |
| tree | 02be307efe587f8eefebaf06b81dd2538b9fa504 /arch/arm/mach-at91/board-pcontrol-g20.c | |
| parent | Merge branch 'clocksource/physical-timers' into next/drivers (diff) | |
| parent | bus: brcmstb_gisb: save and restore GISB timeout (diff) | |
| download | linux-dev-7135466151f0560604c2bfc4c27ff9cc2a40f8cd.tar.xz linux-dev-7135466151f0560604c2bfc4c27ff9cc2a40f8cd.zip | |
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>
Diffstat (limited to 'arch/arm/mach-at91/board-pcontrol-g20.c')
0 files changed, 0 insertions, 0 deletions