git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Ingo Molnar <mingo@elte.hu>
	Sun, 22 May 2011 08:07:37 +0000 (10:07 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Sun, 22 May 2011 08:10:01 +0000 (10:10 +0200)
commit	ff941e2fbfd543c3950ff43608692e70c309c194
tree	693e2b7f1a9cb0c6ed6d44375e370e1ae08c7ac9	tree \| snapshot
parent	1f0765138425f3ba4024e0166d310e71b3af6d7b	commit \| diff
parent	4194f96ef5aa3e2085f98af2d36406000b561b5c	commit \| diff

Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/urgent

Conflicts:
tools/perf/builtin-top.c

Semantic conflict:
util/include/linux/list.h # fix prefetch.h removal fallout

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Linux Kernel Source Tree.

RSS Atom

tools/perf/builtin-test.c	diff1 \|	diff2 \|	blob \| history
tools/perf/builtin-top.c	diff1 \|	diff2 \|	blob \| history
tools/perf/util/evlist.c	diff1 \|	diff2 \|	blob \| history
tools/perf/util/evlist.h	diff1 \|	diff2 \|	blob \| history
tools/perf/util/include/linux/list.h	diff1 \|	diff2 \|	blob \| history
tools/perf/util/python.c	diff1 \|	diff2 \|	blob \| history