linux

mirror of https://github.com/FEX-Emu/linux.git synced 2025-02-03 01:24:40 +00:00

History

Arnd Bergmann 7135466151 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>

2014-12-08 17:16:26 +01:00

arm-cci.c

bus: cci: move away from arm_pmu framework

2014-10-30 12:16:57 +00:00

arm-ccn.c

ARM: SoC driver updates for 3.18

2014-10-08 17:37:16 -04:00

brcmstb_gisb.c

Merge branch 'brcm/stb-smp-uart' into next/drivers

2014-12-08 17:16:26 +01:00

imx-weim.c

bus: imx-weim: populate devices on a simple bus