]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'current/for-linus' into mips-for-linux-next
authorRalf Baechle <ralf@linux-mips.org>
Tue, 4 Dec 2012 21:13:55 +0000 (22:13 +0100)
committerRalf Baechle <ralf@linux-mips.org>
Tue, 4 Dec 2012 21:13:55 +0000 (22:13 +0100)
1  2 
arch/mips/kernel/scall64-n32.S
arch/mips/mm/tlb-r4k.c

Simple merge
Simple merge