Merge branches 'amba', 'fixes', 'kees' and 'misc' into for-next

diff --cc arch/arm/include/asm/pgtable.h
Simple merge

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

diff --cc arch/arm/kernel/traps.c
Simple merge

diff --cc arch/arm/mach-omap2/omap4-common.c
Simple merge

diff --cc arch/arm/mm/dma-mapping.c
index f6b6bfa88ecff21ddde5646dfaafa0190792f247,79f8b39801a8e570bd86ea80e566ee939bbb600b,f61a5707823a40e0af9474d4f18809f9196b1264,f0ea0134e5a356c3f651de61b84f457be58c8801,79f8b39801a8e570bd86ea80e566ee939bbb600b..1a77450e728ad17cf6b8fec2beb3111a2a8bfb94
--- 1/arch/arm/mm/dma-mapping.c
--- 2/arch/arm/mm/dma-mapping.c
--- 3/arch/arm/mm/dma-mapping.c
--- 4/arch/arm/mm/dma-mapping.c
--- 5/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@@@@@ -176,34 -173,32 -212,8 -173,32 -173,32 +212,8 @@@@@@ static u64 get_coherent_dma_mask(struc
                        return 0;
                }
     
-               max_dma_pfn = min(max_pfn, arm_dma_pfn_limit);
-    
-- --           /*
-- --            * If the mask allows for more memory than we can address,
-- --            * and we actually have that much memory, then fail the
-- --            * allocation.
-- --            */
-- --           if (sizeof(mask) != sizeof(dma_addr_t) &&
-- --               mask > (dma_addr_t)~0 &&
-                   dma_to_pfn(dev, ~0) > max_dma_pfn) {
 - --               dma_to_pfn(dev, ~0) > arm_dma_pfn_limit) {
-- --                   dev_warn(dev, "Coherent DMA mask %#llx is larger than dma_addr_t allows\n",
-- --                            mask);
-- --                   dev_warn(dev, "Driver did not use or check the return value from dma_set_coherent_mask()?\n");
-- --                   return 0;
-- --           }
-- --
-- --           /*
-- --            * Now check that the mask, when translated to a PFN,
-- --            * fits within the allowable addresses which we can
-- --            * allocate.
-- --            */
-               if (dma_to_pfn(dev, mask) < max_dma_pfn) {
 - --           if (dma_to_pfn(dev, mask) < arm_dma_pfn_limit) {
-- --                   dev_warn(dev, "Coherent DMA mask %#llx (pfn %#lx-%#lx) covers a smaller range of system memory than the DMA zone pfn 0x0-%#lx\n",
-- --                            mask,
-- --                            dma_to_pfn(dev, 0), dma_to_pfn(dev, mask) + 1,
-- --                            arm_dma_pfn_limit + 1);
++ ++           if (!__dma_supported(dev, mask, true))
                        return 0;
-- --           }
        }
     
        return mask;