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)
commitbb27f55eb9405257a59c82550dbb0d684cc3a665
treebdab5866709e6ac7eeef7493d7d73bbd3d6231b6
parentb732d439cb43336cd6d7e804ecb2c81193ef63b0
parent5e1c81d98a5621007824b49dde556fead5ff9c6c
Merge branch 'perf/core' of git://git./linux/kernel/git/acme/linux into perf/core

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>
kernel/trace/trace.c