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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/mips/Makefile
Simple merge

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

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

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

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

diff --cc arch/mips/mti-malta/malta-memory.c
index 1ca3488,f2364e4..6d97730
--- 1/arch/mips/mti-malta/malta-memory.c
--- 2/arch/mips/mti-malta/malta-memory.c
+++ b/arch/mips/mti-malta/malta-memory.c
@@@ -26,8 -26,8 +26,8 @@@ unsigned long physical_memsize = 0L
  
  fw_memblock_t * __init fw_getmdesc(int eva)
  {
 -      char *memsize_str, *ememsize_str __maybe_unused = NULL, *ptr;
 -      unsigned long memsize = 0, ememsize __maybe_unused = 0;
 +      char *memsize_str, *ememsize_str = NULL, *ptr;
-       unsigned long memsize, ememsize = 0;
++      unsigned long memsize = 0, ememsize = 0;
        static char cmdline[COMMAND_LINE_SIZE] __initdata;
        int tmp;