From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 15 Oct 2015 20:55:53 +0000 (+0200)
Subject: Merge tag 'berlin-soc-for-4.4-2' of git://git.infradead.org/users/hesselba/linux... 
X-Git-Tag: v4.4-rc1~53^2~9
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5462b10af11d0b334fe37883998e0f38b14127bb;p=users%2Fwilly%2Flinux.git

Merge tag 'berlin-soc-for-4.4-2' of git://git.infradead.org/users/hesselba/linux-berlin into next/soc

Merge "Marvell Berlin SoC for 4.4 take 2" from Sebastian Hesselbarth:

- use the non-self-clearing reset register
- add cpu hotplug support

* tag 'berlin-soc-for-4.4-2' of git://git.infradead.org/users/hesselba/linux-berlin:
  arm: berlin: add CPU hotplug support
  arm: berlin: use non-self-cleared reset register to reset cpu
---

5462b10af11d0b334fe37883998e0f38b14127bb