]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2b3f17c 9661ee0)
Merge branch 'perf/rename' into perf/core
authorIngo Molnar <mingo@elte.hu>
Wed, 1 Dec 2010 08:18:12 +0000 (09:18 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 1 Dec 2010 08:22:19 +0000 (09:22 +0100)
commit5da4d9e8fec324390afa15ed091c56d8f2326b80
tree4d1e831872d397cc5bb9cdab6c0e239a0080909ctree | snapshot
parent2b3f17c6d590d378e65cd86e60f0bc8a54c30c9dcommit | diff
parent9661ee08482aa1692a5fb9281a13212e45f01837commit | diff
Merge branch 'perf/rename' into perf/core

Merge reason: This is an older commit under testing that was not pushed yet - merge it.

Also fix up the merge in command-list.txt.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Acked-by: Tom Zanussi <tzanussi@gmail.com>
tools/perf/Makefile diff1 | diff2 | blob | history
tools/perf/builtin-script.c | diff2 | blob | history
tools/perf/command-list.txt diff1 | diff2 | blob | history
Linux Kernel Source Tree.