Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@kernel.org>
Wed, 30 May 2012 07:02:00 +0000 (09:02 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 30 May 2012 07:02:00 +0000 (09:02 +0200)
commit59cd358a7a5b2f6b61faa01dae6cfda3830ac62a
tree1cefdeac3112e790afc275d9e57cd56674084fa4
parent55b78e34b12d07b8ab7d7732fd24892df8eea5c7
parent05e8b0804ec423a440882e7adecb36e7ac43e56f
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>