Merge branch 'topic/img' into for-linus
authorVinod Koul <vinod.koul@intel.com>
Tue, 14 Nov 2017 05:02:49 +0000 (10:32 +0530)
committerVinod Koul <vinod.koul@intel.com>
Tue, 14 Nov 2017 05:02:49 +0000 (10:32 +0530)

Trivial merge