From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 8 Dec 2014 16:16:03 +0000 (+0100)
Subject: Merge branch 'brcm/stb-smp-uart' into next/drivers
X-Git-Tag: omap-for-v3.19/fixes-for-merge-window~13^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7135466151f0560604c2bfc4c27ff9cc2a40f8cd;p=pandora-kernel.git

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>
---

7135466151f0560604c2bfc4c27ff9cc2a40f8cd
Reading git-diff-tree failed