Vinod Koul 11bfedff55 Merge branch 'topic/err_reporting' into for-linus ... Signed-off-by: Vinod Koul <vinod.koul@intel.com> Conflicts: drivers/dma/cppi41.c		2016-10-03 09:17:33 +05:30
..
adma.c	Merge branch 'topic/err_reporting' into for-linus	2016-10-03 09:17:33 +05:30
adma.h	dmaengine: move last completed cookie into generic dma_chan structure	2012-03-13 11:36:06 +05:30
dma.h
Makefile
xor.h