diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-05-22 16:32:02 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-22 16:32:02 +0200 |
| commit | a4526915b67afb09c60bece6bc395e58ba83e271 (patch) | |
| tree | 374b787a3be3c23b96e391fdfd06183f8d6ba270 /fs/qnx6 | |
| parent | 8064887e02fd684fa0576cbbcdbc29ceab125c4c (diff) | |
| parent | ed5cd8163da8d3e02ef83b84e42d555d40bab96a (diff) | |
| download | blackbird-obmc-linux-a4526915b67afb09c60bece6bc395e58ba83e271.tar.gz blackbird-obmc-linux-a4526915b67afb09c60bece6bc395e58ba83e271.zip | |
Merge tag 'arm-soc/for-4.2/soc-take2' of http://github.com/broadcom/stblinux into next/soc
Merge mach-bcm changes from Florian Fainelli:
This pull request contains the following changes:
- Rafal adds an additional fault code to be ignored by the kernel on BCM5301X SoC
- BCM63138 SMP support which:
* common code to control the PMB bus, to be shared with a reset
controller driver in drivers/reset
* secondary CPU initialization sequence using PMB helpers
* small changes suggested by Russell King to allow platforms to disable VFP
* tag 'arm-soc/for-4.2/soc-take2' of http://github.com/broadcom/stblinux:
ARM: BCM63xx: Add SMP support for BCM63138
ARM: vfp: Add vfp_disable for problematic platforms
ARM: vfp: Add include guards
ARM: BCM63xx: Add secondary CPU PMB initialization sequence
ARM: BCM63xx: Add Broadcom BCM63xx PMB controller helpers
ARM: BCM5301X: Ignore another (BCM4709 specific) fault code
Diffstat (limited to 'fs/qnx6')
0 files changed, 0 insertions, 0 deletions
