]> git.karo-electronics.de Git - mv-sheeva.git/commit - tools/perf/bench/mem-memcpy-x86-64-asm.S
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)
commitb3d006c0e745bfd2dab4984ffe3279d5cf4e926a
tree4d1e831872d397cc5bb9cdab6c0e239a0080909c
parent4c635a4e04700a371ef7e4d4bb33ed88747e801e
parent133dc4c39c57eeef2577ca5b4ed24765b7a78ce2
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
tools/perf/builtin-script.c
tools/perf/command-list.txt