]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b732d43 5e1c81d)
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux...
authorIngo Molnar <mingo@kernel.org>
Mon, 21 May 2012 07:17:31 +0000 (09:17 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 21 May 2012 07:17:50 +0000 (09:17 +0200)
Fixes for perf/core:

 - Rename some perf_target methods to avoid double negation, from Namhyung Kim.
 - Revert change to use per task events with inheritance, from Namhyung Kim.
 - Events should start disabled till children starts running, from David Ahern.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
kernel/trace/trace.c patch | diff1 | diff2 | blob | history

diff --cc kernel/trace/trace.c
Simple merge
Linux kernel for KaRo TX COM modules