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

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

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

diff --cc arch/arm/mm/dma-mapping.c
index f6b6bfa88ecff21ddde5646dfaafa0190792f247,c143a7bb681b305c044ecddcc4da6305d5494589,f0ea0134e5a356c3f651de61b84f457be58c8801,79f8b39801a8e570bd86ea80e566ee939bbb600b..6492154934f9be988dd39ebdad08743da1f42cda
--- 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
+++ b/arch/arm/mm/dma-mapping.c
@@@@@ -185,7 -185,7 -180,7 -180,7 +185,7 @@@@@ static u64 get_coherent_dma_mask(struc
                 */
                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) {
+ ++                dma_to_pfn(dev, ~0) < max_dma_pfn) {
                        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");