From: Ingo Molnar Date: Mon, 21 May 2012 07:17:31 +0000 (+0200) Subject: Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bb27f55eb9405257a59c82550dbb0d684cc3a665;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git 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 Signed-off-by: Ingo Molnar --- bb27f55eb9405257a59c82550dbb0d684cc3a665