Merge branch 'topic/compile_test' into for-linus

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

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

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

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

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