]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'metag/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Feb 2016 23:33:26 +0000 (10:33 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Feb 2016 23:33:26 +0000 (10:33 +1100)
1  2 
arch/metag/kernel/ftrace.c

Simple merge