]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'mips/mips-for-linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 19 Jul 2013 00:07:17 +0000 (10:07 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 19 Jul 2013 00:07:17 +0000 (10:07 +1000)
1  2 
arch/mips/kernel/traps.c

Simple merge