From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 1 Jun 2015 15:54:31 +0000 (+0200)
Subject: Merge tag 'arm-soc/for-4.2/soc-part2' of http://github.com/broadcom/stblinux into... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=c9531b4f1535f88fd82e45d1ffbfa61dbee26fb6;p=deliverable%2Flinux.git

Merge tag 'arm-soc/for-4.2/soc-part2' of github.com/broadcom/stblinux into next/soc

Merge "changes for Broadcom SoCs":

- Dan fixes an error path in the BCM63xx SMP code

- Ray adds the relevant Kconfig selects to enable the Broadcom NAND driver on Cygnus

- Kevin provides a change to the Broadcom GISB arbiter driver to make it work with
  MIPS-based big-endian STB SoCs (this was a long-standing change that had dependencies on
  code in drivers/of/*)

- Gregory enables the use of GPIOLIB for brcmstb SoCs and bumps the number of GPIOs for
  these platforms

* tag 'arm-soc/for-4.2/soc-part2' of http://github.com/broadcom/stblinux:
  ARM: brcmstb: Add default gpio number
  ARM: brcmstb: Select ARCH_WANT_OPTIONAL_GPIOLIB
  bus: brcmstb_gisb: Honor the "big-endian" and "native-endian" DT properties
  ARM: BCM: Enable NAND support for iProc SoCs
  ARM: BCM63xx: fix an error path in bcm63xx_pmb_power_on_cpu()
---

c9531b4f1535f88fd82e45d1ffbfa61dbee26fb6