Merge branch 'topic/ioat' into for-linus

author Vinod Koul <[email protected]>

Wed, 14 Dec 2016 03:36:23 +0000 (09:06 +0530)

committer Vinod Koul <[email protected]>

Wed, 14 Dec 2016 03:36:23 +0000 (09:06 +0530)
author Vinod Koul <[email protected]>
Wed, 14 Dec 2016 03:36:23 +0000 (09:06 +0530)
committer Vinod Koul <[email protected]>
Wed, 14 Dec 2016 03:36:23 +0000 (09:06 +0530)
diff --cc drivers/dma/ioat/dma.c
Simple merge
diff --cc drivers/dma/ioat/init.c
Simple merge
author	Vinod Koul <[email protected]>
	Wed, 14 Dec 2016 03:36:23 +0000 (09:06 +0530)
committer	Vinod Koul <[email protected]>
	Wed, 14 Dec 2016 03:36:23 +0000 (09:06 +0530)
		1	2
drivers/dma/ioat/dma.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/dma/ioat/init.c	patch \|	diff1 \|	diff2 \|	blob \| history