Merge branch 'topic/omap' into for-linus
authorVinod Koul <vinod.koul@intel.com>
Wed, 14 Dec 2016 03:36:30 +0000 (09:06 +0530)
committerVinod Koul <vinod.koul@intel.com>
Wed, 14 Dec 2016 03:36:30 +0000 (09:06 +0530)

Trivial merge