Merge branch 'topic/ste' into for-linus
authorVinod Koul <vinod.koul@intel.com>
Wed, 6 Jan 2016 09:48:44 +0000 (15:18 +0530)
committerVinod Koul <vinod.koul@intel.com>
Wed, 6 Jan 2016 09:48:44 +0000 (15:18 +0530)

Trivial merge