]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'bmips' into mips-for-linux-next
authorRalf Baechle <ralf@linux-mips.org>
Tue, 15 Nov 2011 21:26:33 +0000 (21:26 +0000)
committerRalf Baechle <ralf@linux-mips.org>
Tue, 15 Nov 2011 21:26:33 +0000 (21:26 +0000)
1  2 
arch/mips/Kconfig
arch/mips/kernel/traps.c

Simple merge
Simple merge