Merge tag 'v3.10.68' into update

This is the 3.10.68 stable release

diff --cc Makefile
Simple merge

diff --cc arch/arm/kernel/head.S
Simple merge

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

diff --cc arch/arm/mm/dma-mapping.c
Simple merge

diff --cc arch/arm/mm/mmu.c
index 54fc6e5c43703cb43354c0c4812dd1f0e790096c,4c7d5cddef355e24ffdd62b065cea57a95304f6f..f8e6abb67a7540489f556dc5a1cc4be18cd18b84
--- 1/arch/arm/mm/mmu.c
--- 2/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@@ -708,8 -685,8 +708,8 @@@ static void __init alloc_init_pmd(pud_
  }
  
  static void __init alloc_init_pud(pgd_t *pgd, unsigned long addr,
-       unsigned long end, unsigned long phys, const struct mem_type *type,
-       bool force_pages)
+                                 unsigned long end, phys_addr_t phys,
 -                                const struct mem_type *type)
++                                const struct mem_type *type, bool force_pages)
  {
        pud_t *pud = pud_offset(pgd, addr);
        unsigned long next;

diff --cc arch/arm/mm/proc-v7-3level.S
index b45d73fbe547630db79cadd77ed49080326bc12d,110e738bc970f7288d9df72b3d62995fd67b0895..29944d7e769a364ba98b6194ae4ce53cfec411f0
--- 1/arch/arm/mm/proc-v7-3level.S
--- 2/arch/arm/mm/proc-v7-3level.S
+++ b/arch/arm/mm/proc-v7-3level.S
@@@ -78,15 -78,16 +78,20 @@@ ENTRY(cpu_v7_set_pte_ext
        tst     rh, #1 << (57 - 32)             @ L_PTE_NONE
        bicne   rl, #L_PTE_VALID
        bne     1f
-       tst     rh, #1 << (55 - 32)             @ L_PTE_DIRTY
-       orreq   rl, #L_PTE_RDONLY
+ 
+       eor     ip, rh, #1 << (55 - 32) @ toggle L_PTE_DIRTY in temp reg to
+                                       @ test for !L_PTE_DIRTY || L_PTE_RDONLY
+       tst     ip, #1 << (55 - 32) | 1 << (58 - 32)
+       orrne   rl, #PTE_AP2
+       biceq   rl, #PTE_AP2
+ 
  1:    strd    r2, r3, [r0]
        ALT_SMP(W(nop))
 +#ifdef CONFIG_ARM_ERRATA_824069
 +      ALT_UP (mcr     p15, 0, r0, c7, c14, 1)         @ flush_pte
 +#else
        ALT_UP (mcr     p15, 0, r0, c7, c10, 1)         @ flush_pte
 +#endif
  #endif
        mov     pc, lr
  ENDPROC(cpu_v7_set_pte_ext)

diff --cc fs/pstore/ram.c
Simple merge

diff --cc kernel/workqueue.c
Simple merge

diff --cc net/wireless/nl80211.c
Simple merge