Merge branch 'topic/unmap_cleanup' into for-linus

diff --cc drivers/dma/fsl_raid.c
Simple merge

diff --cc drivers/dma/fsldma.c
Simple merge

diff --cc drivers/dma/mv_xor.c
Simple merge

diff --cc drivers/dma/ppc4xx/adma.c
Simple merge