Merge branch 'fix/omap' into fixes
authorVinod Koul <vinod.koul@intel.com>
Sat, 16 Apr 2016 17:15:17 +0000 (22:45 +0530)
committerVinod Koul <vinod.koul@intel.com>
Sat, 16 Apr 2016 17:15:17 +0000 (22:45 +0530)

Trivial merge