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

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

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 65d394e 27465f4)

author	Ingo Molnar <mingo@elte.hu>
	Thu, 16 Dec 2010 10:22:25 +0000 (11:22 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Thu, 16 Dec 2010 10:22:27 +0000 (11:22 +0100)
commit	cad2f6c21019042a8bebe0e82244636d6de0bea9
tree	948b08825a36114c85ddc2bfcd965c261e32810f	tree \| snapshot
parent	65d394e35ed756942386cb64d25ed598471d4f0a	commit \| diff
parent	27465f4cbd601c1b7a4e2ee64ba3ffae76cbd491	commit \| diff

Merge branch 'perf/urgent' into perf/core

Merge reason: We want to apply a dependent patch.

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

include/linux/perf_event.h	diff1 \|	diff2 \|	blob \| history
kernel/perf_event.c	diff1 \|	diff2 \|	blob \| history
tools/perf/builtin-record.c	diff1 \|	diff2 \|	blob \| history
tools/perf/util/header.c	diff1 \|	diff2 \|	blob \| history
tools/perf/util/symbol.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.