Merge branch 'topic/omap' into for-linus
authorVinod Koul <vinod.koul@intel.com>
Mon, 3 Oct 2016 03:48:55 +0000 (09:18 +0530)
committerVinod Koul <vinod.koul@intel.com>
Mon, 3 Oct 2016 03:48:55 +0000 (09:18 +0530)

Trivial merge