git.maquefel.me Git - linux.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	bb1693f89ae7f0b30c90d9b26a4f827faed1144a
tree	e02fc59d76d79493bffa190e492775baa134bff6	tree \| snapshot
parent	efb3040d481a1594592b1defb4526c406c7a4751	commit \| diff
parent	45179fec946dd554f74e950d2278dabd5ad23fd3	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

ep93xx device tree rework repo: git://git.maquefel.me/linux.git

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