]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'xtensa/for_next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 00:36:48 +0000 (11:36 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 00:36:48 +0000 (11:36 +1100)
1  2 
arch/xtensa/kernel/traps.c

Simple merge