Merge branch 'topic/sh' into for-linus
authorVinod Koul <vkoul@kernel.org>
Mon, 31 Dec 2018 14:02:16 +0000 (19:32 +0530)
committerVinod Koul <vkoul@kernel.org>
Mon, 31 Dec 2018 14:02:16 +0000 (19:32 +0530)

Trivial merge