Merge tag 'arm-soc/for-4.6/soc' of http://github.com/Broadcom/stblinux into next/soc
authorArnd Bergmann <arnd@arndb.de>
Fri, 26 Feb 2016 22:16:08 +0000 (23:16 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 26 Feb 2016 22:16:08 +0000 (23:16 +0100)
Merge "Broadcom soc changes for 4.6" from Florian Fainelli:

This pull request contains Broadcom ARM-based SoC/platform changes:

- Masahiro updates the Broadcom Northstar Plus SMP operations to be annotated
  with const and __initconst

- Florian removes an unused variable in the Broadcom BCM63XX SMP code

* tag 'arm-soc/for-4.6/soc' of http://github.com/Broadcom/stblinux:
  ARM: BCM63xx: Remove unused pmb_dn variable
  ARM: bcm: use const and __initconst for smp_operations


Trivial merge