Merge branch 'mips-next-3.10' of git://git.linux-mips.org/pub/scm/john/linux-john...

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

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

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