From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 23 May 2014 22:44:26 +0000 (+0200)
Subject: Merge tag 'for-3.16/bcm-soc' of git://github.com/broadcom/mach-bcm into next/soc
X-Git-Tag: v3.16-rc1~30^2~44^2~16
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=1ef81bf7bcc9d795619197b15218304c9d42c18c;p=~emulex%2Finfiniband.git

Merge tag 'for-3.16/bcm-soc' of git://github.com/broadcom/mach-bcm into next/soc

Merge "mach-bcm 3.16 soc updates" From Matt Porter:

* only show ARCH_BCM in multi v6/v7 configs
* enable ARM erratum 775420
* bcm_defconfig updates for pwm

* tag 'for-3.16/bcm-soc' of git://github.com/broadcom/mach-bcm:
  ARM: bcm_defconfig: Enable PWM and Backlight
  ARM: mach-bcm: add ARM_ERRATA_775420
  ARM: bcm: Restrict ARCH_BCM selection to ARCH_MULTI_V6_V7

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

1ef81bf7bcc9d795619197b15218304c9d42c18c