Merge tag 'arm-soc/for-4.3/soc' of http://github.com/broadcom/stblinux into next...
authorOlof Johansson <olof@lixom.net>
Fri, 17 Jul 2015 17:19:04 +0000 (10:19 -0700)
committerOlof Johansson <olof@lixom.net>
Fri, 17 Jul 2015 17:19:04 +0000 (10:19 -0700)
Merge "Broadcom SoC changes for 4.3 (part 1)" from Florian Fainelli:

This pull request contains two fixes for the Broadcom BCM63xx SMP code:

- Sudeep removes an invalid use of cpu_logical_map() which turned to be a no-op
  since we always boot from physical CPU 0 = logical CPU 0

- Florian removes the custom secondary_startup function and replaces it with
  the generic one

* tag 'arm-soc/for-4.3/soc' of http://github.com/broadcom/stblinux:
  ARM: BCM63xx: Remove custom secondary_startup function
  ARM: BCM63xx: fix parameter to of_get_cpu_node in bcm63138_smp_boot_secondary

Signed-off-by: Olof Johansson <olof@lixom.net>

Trivial merge