]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'fixes-for-linus' into mips-for-linux-next
authorRalf Baechle <ralf@linux-mips.org>
Mon, 14 Nov 2011 13:59:41 +0000 (13:59 +0000)
committerRalf Baechle <ralf@linux-mips.org>
Mon, 14 Nov 2011 13:59:41 +0000 (13:59 +0000)
1  2 
arch/mips/kernel/cevt-r4k.c

Simple merge