Merge branch 'mips-next-3.10' of git://git.linux-mips.org/pub/scm/john/linux-john...
authorRalf Baechle <ralf@linux-mips.org>
Tue, 7 May 2013 23:27:46 +0000 (01:27 +0200)
committerRalf Baechle <ralf@linux-mips.org>
Tue, 7 May 2013 23:27:46 +0000 (01:27 +0200)
commit9b3539e0e545e4c2f338acfc1ce52033a6f5e7f7
tree5c56e4a208dbe7e985e59911e1a421a7c1ee024c
parent3d39019a1655d195a60a86ebf38f9da30bd83d03
parent1cd1c049271233deccfcc75123afa7f39a607f5a
Merge branch 'mips-next-3.10' of git://git.linux-mips.org/john/linux-john into mips-for-linux-next
arch/mips/include/asm/mmu_context.h
arch/mips/kernel/traps.c
arch/mips/mm/tlbex.c