Merge branch 'topic/stm' into for-linus
authorVinod Koul <vinod.koul@intel.com>
Wed, 31 Jan 2018 08:21:06 +0000 (13:51 +0530)
committerVinod Koul <vinod.koul@intel.com>
Wed, 31 Jan 2018 08:21:06 +0000 (13:51 +0530)

Trivial merge