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

Conflicts:
	arch/x86/include/asm/dma-mapping.h

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

diff --cc arch/Kconfig
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mm/init.c
Simple merge

diff --cc arch/arm/mm/mmu.c
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/include/asm/dma-mapping.h
index 61c0bd25845af0b1ceea8892df20dd717dd2d148,7b9227b44b9b072422b4ef5a17ddde38008817fe..f7b4c7903e7e51eb317ecfcd6fa9be05a3336f65
--- 1/arch/x86/include/asm/dma-mapping.h
--- 2/arch/x86/include/asm/dma-mapping.h
+++ b/arch/x86/include/asm/dma-mapping.h
@@@ -62,12 -63,10 +63,16 @@@ extern void *dma_generic_alloc_coherent
                                        dma_addr_t *dma_addr, gfp_t flag,
                                        struct dma_attrs *attrs);
  
+ extern void dma_generic_free_coherent(struct device *dev, size_t size,
+                                     void *vaddr, dma_addr_t dma_addr,
+                                     struct dma_attrs *attrs);
+ 
 +#ifdef CONFIG_X86_DMA_REMAP /* Platform code defines bridge-specific code */
 +extern bool dma_capable(struct device *dev, dma_addr_t addr, size_t size);
 +extern dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr);
 +extern phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr);
 +#else
 +
  static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)
  {
        if (!dev->dma_mask)

diff --cc arch/x86/kernel/setup.c
Simple merge

diff --cc include/linux/mmzone.h
Simple merge

diff --cc mm/Kconfig
Simple merge

diff --cc mm/Makefile
Simple merge

diff --cc mm/vmstat.c
Simple merge