]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'for-3.16/bcm-soc' of git://github.com/broadcom/mach-bcm into next/soc
authorArnd Bergmann <arnd@arndb.de>
Fri, 23 May 2014 22:44:26 +0000 (00:44 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 23 May 2014 22:44:26 +0000 (00:44 +0200)
commit680778201762c2665647cd7af79b75d68b000001
treec5989c5ee1d46ce9a4983f191545ed39357d7a5d
parentd80a888d06da6fcc64d562a51677b6905eab8e4e
parent7f17cbaf0c4e2ad71fbb688325a49f1c6303c717
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>
arch/arm/mach-bcm/Kconfig