]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'ftrace/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 05:37:20 +0000 (15:37 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 05:37:20 +0000 (15:37 +1000)
1  2 
kernel/trace/trace_kprobe.c
kernel/trace/trace_uprobe.c
tools/lib/traceevent/event-parse.c

Simple merge
Simple merge
Simple merge