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

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

author	Ingo Molnar <mingo@elte.hu>
	Tue, 31 Jan 2012 12:02:35 +0000 (13:02 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Tue, 31 Jan 2012 12:02:37 +0000 (13:02 +0100)
commit	64cd7fa647853f6c8a1c3995b7561dcfe3262e3e
tree	e02fc59d76d79493bffa190e492775baa134bff6	tree \| snapshot
parent	c40a71c48e68519f55930a15aaa2dde368f00a1a	commit \| diff
parent	d8c24b44f2d1ff4e81ea30c066901cbe42a78bcf	commit \| diff

Merge branch 'perf/urgent' into perf/core

We cherry-picked 3 commits into perf/urgent, merge them back to allow
conflict-free work on those files.

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

include/linux/perf_event.h	diff1 \|	diff2 \|	blob \| history
kernel/events/core.c	diff1 \|	diff2 \|	blob \| history
tools/perf/builtin-top.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

include/linux/perf_event.h	diff1 \|	diff2 \|	blob \| history
kernel/events/core.c	diff1 \|	diff2 \|	blob \| history
tools/perf/builtin-top.c	diff1 \|	diff2 \|	blob \| history