summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2014-05-01 10:24:39 +0400
committerIngo Molnar <mingo@kernel.org>2014-05-01 10:24:39 +0400
commitaeffe2abc894b585acbe0923c0d4f21b4c5c1035 (patch)
treead712872dba8b8b1aa159fdb0f6dc7cc0ab5f9c6 /include
parent201131998fbf074b03679afedcc29948e63331ef (diff)
parent399f0c220a0ee97a5a9ea1a699a58fe2aacf2983 (diff)
downloadlinux-aeffe2abc894b585acbe0923c0d4f21b4c5c1035.tar.xz
Merge branch 'perf/urgent' into perf/core, to resolve conflict
Conflicts: tools/perf/arch/x86/tests/dwarf-unwind.c Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions