]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
projects / mirror_ubuntu-kernels.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 35039eb 3726cc7)
Merge branch 'perf/core' into perf/probes
authorIngo Molnar <mingo@elte.hu>
Tue, 17 Nov 2009 09:16:43 +0000 (10:16 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 17 Nov 2009 09:17:47 +0000 (10:17 +0100)
commita7b63425a41cd6a8d50f76fef0660c5110f97e91
treebe17ee121f1c8814d8d39c9f3e0205d9397fab54tree
parent35039eb6b199749943547c8572be6604edf00229commit | diff
parent3726cc75e581c157202da93bb2333cce25c15c98commit | diff
Merge branch 'perf/core' into perf/probes

Resolved merge conflict in tools/perf/Makefile

Merge reason: we want to queue up a dependent patch.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/Makefile diff1 | diff2 | blob | history
tools/perf/Makefile diff1 | diff2 | blob | history
tools/perf/builtin.h diff1 | diff2 | blob | history
tools/perf/command-list.txt diff1 | diff2 | blob | history
tools/perf/perf.c diff1 | diff2 | blob | history
tools/perf/util/util.h diff1 | diff2 | blob | history
Ubuntu combined Linux kernel mirror