Merge branch 'topic/sh' into for-linus
authorVinod Koul <vinod.koul@intel.com>
Mon, 14 Mar 2016 05:48:27 +0000 (11:18 +0530)
committerVinod Koul <vinod.koul@intel.com>
Mon, 14 Mar 2016 05:48:27 +0000 (11:18 +0530)

Trivial merge