Merge branch 'topic/stm' into for-linus
authorVinod Koul <vinod.koul@intel.com>
Tue, 10 Apr 2018 03:25:58 +0000 (08:55 +0530)
committerVinod Koul <vinod.koul@intel.com>
Tue, 10 Apr 2018 03:25:58 +0000 (08:55 +0530)

Trivial merge