diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-05-30 09:02:00 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-05-30 09:02:00 +0200 |
| commit | 59cd358a7a5b2f6b61faa01dae6cfda3830ac62a (patch) | |
| tree | 1cefdeac3112e790afc275d9e57cd56674084fa4 /net/nfc/hci/shdlc.c | |
| parent | 55b78e34b12d07b8ab7d7732fd24892df8eea5c7 (diff) | |
| parent | 05e8b0804ec423a440882e7adecb36e7ac43e56f (diff) | |
| download | op-kernel-dev-59cd358a7a5b2f6b61faa01dae6cfda3830ac62a.zip op-kernel-dev-59cd358a7a5b2f6b61faa01dae6cfda3830ac62a.tar.gz | |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/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>
Diffstat (limited to 'net/nfc/hci/shdlc.c')
0 files changed, 0 insertions, 0 deletions
