Merge branch 'topic/sh' into for-linus
authorVinod Koul <vinod.koul@intel.com>
Sat, 16 Jul 2016 14:40:17 +0000 (20:10 +0530)
committerVinod Koul <vinod.koul@intel.com>
Sat, 16 Jul 2016 14:40:17 +0000 (20:10 +0530)

Trivial merge