Merge branch '4.0-fixes' into mips-for-linux-next

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/mips/Makefile
Simple merge

diff --cc arch/mips/bcm47xx/board.c
Simple merge

diff --cc arch/mips/include/asm/cpu-features.h
Simple merge

diff --cc arch/mips/include/asm/cpu.h
index fd2e893e9d9f7d0a28fd48b04d3ea10be8b090a5,e492c740bb9448d9cbb82c5c56a1093b5f9d19c1..e3adca1d0b9956060845a803d77fad2a1f21f75f
--- 1/arch/mips/include/asm/cpu.h
--- 2/arch/mips/include/asm/cpu.h
+++ b/arch/mips/include/asm/cpu.h
@@@ -377,7 -377,7 +377,8 @@@ enum cpu_type_enum 
  #define MIPS_CPU_MAAR         0x400000000ull /* MAAR(I) registers are present */
  #define MIPS_CPU_FRE          0x800000000ull /* FRE & UFE bits implemented */
  #define MIPS_CPU_RW_LLB               0x1000000000ull /* LLADDR/LLB writes are allowed */
- #define MIPS_CPU_CDMM         0x2000000000ull /* CPU has Common Device Memory Map */
+ #define MIPS_CPU_XPA          0x2000000000ull /* CPU supports Extended Physical Addressing */
++#define MIPS_CPU_CDMM         0x4000000000ull /* CPU has Common Device Memory Map */
  
  /*
   * CPU ASE encodings

diff --cc arch/mips/include/asm/elf.h
Simple merge

diff --cc arch/mips/kernel/cpu-probe.c
Simple merge

diff --cc arch/mips/kernel/unaligned.c
Simple merge

diff --cc arch/mips/mm/tlb-r4k.c
Simple merge

diff --cc arch/mips/mm/tlbex.c
Simple merge

diff --cc arch/mips/mti-malta/malta-memory.c
Simple merge