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	2014-07-18 16:11:36 +08:00
Kconfig	bus: brcmstb_gisb: Make the driver buildable on MIPS	2014-11-28 15:44:42 -08:00
Makefile	bus: ARM CCN PMU driver	2014-07-23 22:14:43 +02:00
mvebu-mbus.c	ARM: SoC updates for 3.16 (part 1)	2014-06-02 16:15:12 -07:00
omap_l3_noc.c	bus: omap_l3_noc: Correct returning IRQ_HANDLED unconditionally in the irq handler	2014-11-12 07:16:27 -08:00
omap_l3_noc.h	bus: omap_l3_noc: Fix connID for OMAP4	2014-09-11 10:43:39 -07:00
omap_l3_smx.c
omap_l3_smx.h
omap-ocp2scp.c	ARM: OMAP2+: Remove omap4 ocp2scp pdata	2013-05-30 13:09:31 -07:00
vexpress-config.c	ARM: vexpress: refine dependencies for new code	2014-05-26 21:26:52 +02:00