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

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

author	Ingo Molnar <mingo@elte.hu>
	Tue, 5 Oct 2010 07:47:14 +0000 (09:47 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Tue, 5 Oct 2010 07:47:14 +0000 (09:47 +0200)
commit	c50db1704188e2e080edfdd7b149cd42b8d6aaaf
tree	5554648e4411fcd6909214f71370348567cf4b2d	tree \| snapshot
parent	f573f461cdc6a1dc484bf21d6438b89f4fb83d6a	commit \| diff
parent	a5d72eb49af9c1ab504c9bd16b9dcd3ad7b35c30	commit \| diff

Merge branch 'perf/urgent' into perf/core

Conflicts:
tools/perf/util/ui/browsers/hists.c

Merge reason: fix the conflict and merge in changes for dependent patch.

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

Linux Kernel Source Tree.

RSS Atom

arch/arm/oprofile/common.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/perf_event.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/perf_event_p4.c	diff1 \|	diff2 \|	blob \| history
tools/perf/Makefile	diff1 \|	diff2 \|	blob \| history