Merge commit 'smp-hotplug^{/omap2}' into for-linus
authorRussell King <rmk+kernel@armlinux.org.uk>
Fri, 4 Jan 2019 14:34:46 +0000 (14:34 +0000)
committerRussell King <rmk+kernel@armlinux.org.uk>
Fri, 4 Jan 2019 14:34:46 +0000 (14:34 +0000)

Trivial merge