Merge tag 'arm-soc/for-3.20/brcmstb-smp' of http://github.com/broadcom/stblinux into...
authorOlof Johansson <olof@lixom.net>
Tue, 13 Jan 2015 23:23:49 +0000 (15:23 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 13 Jan 2015 23:23:49 +0000 (15:23 -0800)
Merge "ARM: brcmstb: SMP updates for v3.20" from Florian Fainelli:

This pull request contains updates to the brcmstb SMP code to use the manual
sequence instead of hardware state machine since it is not reliable.

* tag 'arm-soc/for-3.20/brcmstb-smp' of http://github.com/broadcom/stblinux:
  ARM: brcmstb: update CPU power management sequence

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

Trivial merge