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

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/arm/mm/dma-mapping.c
index 5cfc989940761f0a8aa317b3bc37270d40835178,106f89eb5222e69cd1640d2aa9dadc19242e34cf..ceb81b48940efd161d47a93fa182b65bc2de96c8
--- 1/arch/arm/mm/dma-mapping.c
--- 2/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@@ -22,8 -22,8 +22,9 @@@
  #include <linux/memblock.h>
  #include <linux/slab.h>
  #include <linux/iommu.h>
+ #include <linux/io.h>
  #include <linux/vmalloc.h>
 +#include <linux/sizes.h>
  
  #include <asm/memory.h>
  #include <asm/highmem.h>

diff --cc arch/powerpc/kernel/dma.c
Simple merge

diff --cc arch/powerpc/kernel/vio.c
Simple merge

diff --cc mm/vmalloc.c
Simple merge