aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-11-21 13:57:35 +0100
committerIngo Molnar <mingo@elte.hu>2009-11-21 13:57:35 +0100
commit7031281e02bf951a2259849217193fb9d75a9762 (patch)
tree54dae585a10100f977c525399b7598855b3ca7df /arch
parentba77c9e11111a172c9e8687fe16a6a173a61916f (diff)
parentd62d77fd18cc82e839e49b7ef3360e4411f7d2e5 (diff)
Merge branch 'perf/urgent' into perf/core
Conflicts: tools/perf/util/symbol.c Merge reason: this fix will get merged in .33, not .32, plus resolve the conflict. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions