Merge remote-tracking branch 'slave-dma/next'

Conflicts:
	drivers/dma/amba-pl08x.c

diff --cc drivers/dma/amba-pl08x.c
index be21e3f138a88a6317da6e40318d3dc79d9bd5e1,849eab85514bcf8fd25dbd3786f871f4755cbfa4..3c2cad5b1165d7d458722bcdf714dc5e22c21c0b
--- 1/drivers/dma/amba-pl08x.c
--- 2/drivers/dma/amba-pl08x.c
+++ b/drivers/dma/amba-pl08x.c
@@@ -77,17 -72,16 +72,17 @@@
  #include <linux/amba/bus.h>
  #include <linux/amba/pl08x.h>
  #include <linux/debugfs.h>
+ #include <linux/delay.h>
+ #include <linux/device.h>
+ #include <linux/dmaengine.h>
+ #include <linux/dmapool.h>
++#include <linux/dma-mapping.h>
+ #include <linux/init.h>
+ #include <linux/interrupt.h>
+ #include <linux/module.h>
+ #include <linux/pm_runtime.h>
  #include <linux/seq_file.h>
- 
+ #include <linux/slab.h>
  #include <asm/hardware/pl080.h>
  
  #define DRIVER_NAME   "pl08xdmac"