| commit | 1ef81bf7bcc9d795619197b15218304c9d42c18c | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Sat May 24 00:44:26 2014 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Sat May 24 00:44:26 2014 +0200 |
| tree | c5989c5ee1d46ce9a4983f191545ed39357d7a5d | |
| parent | 80e98a9ca6ded6d0fb6c2362c07638cbe3c58e2c [diff] | |
| parent | 387468d190f0ba72e239c11e9663cfeaeaf9ae2d [diff] |
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>