From: Vinod Koul <vinod.koul@intel.com>
Date: Sat, 31 Oct 2015 02:06:55 +0000 (+0530)
Subject: Merge branch 'topic/edma' into for-linus
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7d9d43ace29be375d3d1654b688b94029308a1be;p=linux.git

Merge branch 'topic/edma' into for-linus

Signed-off-by: Vinod Koul <vinod.koul@intel.com>

Conflicts:
	drivers/dma/edma.c
---

7d9d43ace29be375d3d1654b688b94029308a1be