Merge commit 'origin/master' into next

Manual merge of:
	arch/powerpc/include/asm/pgtable-ppc32.h

diff --cc arch/powerpc/include/asm/pgtable-ppc32.h
index 211c90d,820b5f0..98bd7c5
--- 1/arch/powerpc/include/asm/pgtable-ppc32.h
--- 2/arch/powerpc/include/asm/pgtable-ppc32.h
+++ b/arch/powerpc/include/asm/pgtable-ppc32.h
@@@ -429,11 -429,10 +429,11 @@@ extern int icache_44x_need_flush
  #define PMD_PAGE_SIZE(pmd)    bad_call_to_PMD_PAGE_SIZE()
  #endif
  
- #define _PAGE_CHG_MASK        (PAGE_MASK | _PAGE_ACCESSED | _PAGE_DIRTY)
- 
 +#define _PAGE_HPTEFLAGS _PAGE_HASHPTE
 +
+ #define _PAGE_CHG_MASK        (PAGE_MASK | _PAGE_ACCESSED | _PAGE_DIRTY | \
+                        _PAGE_SPECIAL)
  
 -
  #define PAGE_PROT_BITS        (_PAGE_GUARDED | _PAGE_COHERENT | _PAGE_NO_CACHE | \
                         _PAGE_WRITETHRU | _PAGE_ENDIAN | \
                         _PAGE_USER | _PAGE_ACCESSED | \

diff --cc arch/powerpc/mm/numa.c
Simple merge

diff --cc drivers/watchdog/Kconfig
Simple merge

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