From: Ingo Molnar <mingo@kernel.org>
Date: Wed, 30 May 2012 07:02:00 +0000 (+0200)
Subject: Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: MMI-PSA29.97-13-9~16636^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=59cd358a7a5b2f6b61faa01dae6cfda3830ac62a;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge tag 'perf-core-for-mingo' of git://git./linux/kernel/git/acme/linux into perf/urgent

Annotation fixes/improvements from Arnaldo Carvalho de Melo:

. Make the annotatation toggles (hide_src_code, jump_arrows, use_offset, etc)
  global so that navigation doesn't resets them on new annotations.

. Introduce an '[annotate]' config file section to allow permanent changes
  to the annotate browser defaults.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

59cd358a7a5b2f6b61faa01dae6cfda3830ac62a