]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'ftrace/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Mar 2014 04:07:35 +0000 (15:07 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Mar 2014 04:07:35 +0000 (15:07 +1100)
1  2 
kernel/trace/blktrace.c
kernel/trace/trace_irqsoff.c

Simple merge
Simple merge