projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f921281 a0cccc2)
Merge branch 'perf/live' into perf/core
authorIngo Molnar <mingo@elte.hu>
Thu, 15 Apr 2010 07:13:26 +0000 (09:13 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 15 Apr 2010 07:13:26 +0000 (09:13 +0200)
commit84b13fd596522db47f9545d5124c30cc00dfdf5a
treec1f51b8fe43a59fb56ea43a18da88c0d0812dd7dtree | snapshot
parentf92128193094c288bc315db1694fafeaeb7ee1d0commit | diff
parenta0cccc2e8e9fb16cbed3a117b30e3fbac3092ee3commit | diff
Merge branch 'perf/live' into perf/core

Conflicts:
tools/perf/builtin-record.c

Merge reason: add the live tracing feature, resolve conflict.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
tools/perf/builtin-record.c diff1 | diff2 | blob | history
ep93xx device tree rework repo: git://git.maquefel.me/linux.git