summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-06-04 12:28:05 +0200
committerIngo Molnar <mingo@elte.hu>2011-06-04 12:28:05 +0200
commit3ce2a0bc9dfb6423491afe0afc9f099e24b8cba4 (patch)
tree58fbef582846fef0e777b1a552aca12e21a071b1 /.mailmap
parentaef29bf20bd79c73992ab23d5067e9f0448b466e (diff)
parentaa4a221875873d2a1f9656cb7fd7e545e952b4fa (diff)
Merge branch 'perf/urgent' into perf/core
Conflicts: tools/perf/util/python.c Merge reason: resolve the conflict with perf/urgent. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions