Merge branch 'topic/txx' into for-linus
authorVinod Koul <vkoul@kernel.org>
Mon, 4 Jun 2018 04:59:22 +0000 (10:29 +0530)
committerVinod Koul <vkoul@kernel.org>
Mon, 4 Jun 2018 04:59:22 +0000 (10:29 +0530)

Trivial merge