Merge branch 'email/acme' into perf/core
authorIngo Molnar <mingo@kernel.org>
Tue, 8 Mar 2016 09:15:43 +0000 (10:15 +0100)
committerIngo Molnar <mingo@kernel.org>
Tue, 8 Mar 2016 09:15:43 +0000 (10:15 +0100)
commitb9461ba85f11de61d11ad4e13c806ff174ddf577
tree80923f1ac26505ec187e9e3ef0946befb1fe0012
parent009668520ae00d52026ccdb3884864e3473c6b65
parent58ecd33be90647724a78ce5e0b42f5bc482771fd
Merge branch 'email/acme' into perf/core

Merge perf/core improvements and fixes from Arnaldo Carvalho de Melo:

    User visible changes:

 - Allow grouping multiple sort keys per 'perf report/top --hierarchy'
   level (Namhyung Kim)

 - Document 'perf stat --detailed' option (Borislav Petkov)

Infrastructure changes:

 - jitdump prep work for supporting it with Intel PT (Adrian Hunter)

 - Use 64-bit shifts with (TSC) time conversion (Adrian Hunter)

Fixes:

 - Explicitly declare inc_group_count as a void function (Colin Ian King)

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