Merge branch 'topic/edma' into for-linus
authorVinod Koul <vinod.koul@intel.com>
Mon, 14 Mar 2016 05:47:36 +0000 (11:17 +0530)
committerVinod Koul <vinod.koul@intel.com>
Mon, 14 Mar 2016 05:47:36 +0000 (11:17 +0530)

Trivial merge