]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'mips/mips-for-linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 30 Aug 2011 02:18:23 +0000 (12:18 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 30 Aug 2011 02:18:23 +0000 (12:18 +1000)
1  2 
arch/mips/kernel/scall32-o32.S

Simple merge