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)
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


Trivial merge