]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'perf/uprobes'
authorIngo Molnar <mingo@kernel.org>
Thu, 8 May 2014 10:40:07 +0000 (12:40 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 8 May 2014 10:40:07 +0000 (12:40 +0200)
1  2 
kernel/trace/trace_uprobe.c

Simple merge