diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-05-24 00:44:26 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-05-24 00:44:26 +0200 |
| commit | 1ef81bf7bcc9d795619197b15218304c9d42c18c (patch) | |
| tree | c5989c5ee1d46ce9a4983f191545ed39357d7a5d /arch/arm/mach-rockchip | |
| parent | Merge branch 'bcm/cleanup' into next/soc (diff) | |
| parent | ARM: bcm_defconfig: Enable PWM and Backlight (diff) | |
| download | linux-1ef81bf7bcc9d795619197b15218304c9d42c18c.tar.xz linux-1ef81bf7bcc9d795619197b15218304c9d42c18c.zip | |
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>
Diffstat (limited to 'arch/arm/mach-rockchip')
0 files changed, 0 insertions, 0 deletions