Merge branch 'topic/zxdma' into for-linus
authorVinod Koul <vinod.koul@intel.com>
Sun, 23 Aug 2015 13:24:39 +0000 (18:54 +0530)
committerVinod Koul <vinod.koul@intel.com>
Sun, 23 Aug 2015 13:24:39 +0000 (18:54 +0530)

Trivial merge