| commit | 5462b10af11d0b334fe37883998e0f38b14127bb | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Thu Oct 15 22:55:53 2015 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Thu Oct 15 22:55:53 2015 +0200 |
| tree | 11661bc2e26d9e75273e957ab6690a6e67bc755b | |
| parent | 8207e2edbdb5f2b14b653229570a4539a03d906b [diff] | |
| parent | a7b3d5a715f489ee542e59d722281c9f16da50dc [diff] |
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