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

Trivial merge