Merge tag 'v3.10.39' into linux-linaro-lsk

This is the 3.10.39 stable release

diff --cc arch/arm/mm/Kconfig
Simple merge

diff --cc arch/arm64/include/asm/pgtable.h
index b4d6eae1aef4f67d85e3e8a7091427c8220e1d70,3a710d7b14cec76f11cb3a2b69748a48096c114c..b8940733ee30e9e2ce9cd737e06001c0b41da9da
--- 1/arch/arm64/include/asm/pgtable.h
--- 2/arch/arm64/include/asm/pgtable.h
+++ b/arch/arm64/include/asm/pgtable.h
@@@ -193,12 -161,10 +193,12 @@@ static inline void set_pte_at(struct mm
                              pte_t *ptep, pte_t pte)
  {
        if (pte_valid_user(pte)) {
-               if (pte_exec(pte))
+               if (!pte_special(pte) && pte_exec(pte))
                        __sync_icache_dcache(pte, addr);
 -              if (!pte_dirty(pte))
 -                      pte = pte_wrprotect(pte);
 +              if (pte_dirty(pte) && pte_write(pte))
 +                      pte_val(pte) &= ~PTE_RDONLY;
 +              else
 +                      pte_val(pte) |= PTE_RDONLY;
        }
  
        set_pte(ptep, pte);

diff --cc mm/hugetlb.c
Simple merge