]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'arm-soc/for-4.2/soc-take2' of http://github.com/broadcom/stblinux into...
authorArnd Bergmann <arnd@arndb.de>
Fri, 22 May 2015 14:32:02 +0000 (16:32 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 22 May 2015 14:32:02 +0000 (16:32 +0200)
commitc351f88cf2f5cc9c2573b0d13ed7c06805c0eaae
tree374b787a3be3c23b96e391fdfd06183f8d6ba270
parentafea804c9746ddf720f7eea6a668193d2733ee45
parent7a5ef9abe5f4aa2b6b6abc7ff2835811eef58099
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