]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Merge tag 'berlin-soc-for-4.4-2' of git://git.infradead.org/users/hesselba/linux...
authorArnd Bergmann <arnd@arndb.de>
Thu, 15 Oct 2015 20:55:53 +0000 (22:55 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 15 Oct 2015 20:55:53 +0000 (22:55 +0200)
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


Trivial merge