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

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

author	Ingo Molnar <mingo@elte.hu>
	Fri, 26 Nov 2010 14:07:02 +0000 (15:07 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Fri, 26 Nov 2010 14:07:02 +0000 (15:07 +0100)
commit	a7dcac5f5b477527c04719ccc0ee41af5dbb35ed
tree	9a290f1742526a8816f94560cb09bc0a09c910de	tree \| snapshot
parent	5dd9202bbb2858a7d7ab806812588f4bd5659308	commit \| diff
parent	d53a65719c03facf3e1c1a6118dbd513e7c8dec0	commit \| diff

Merge branch 'perf/urgent' into perf/core

Conflicts:
arch/x86/kernel/apic/hw_nmi.c

Merge reason: Resolve conflict, queue up dependent patch.

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

Linux Kernel Source Tree.

RSS Atom

arch/x86/kernel/apic/hw_nmi.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/perf_event.c	diff1 \|	diff2 \|	blob \| history
kernel/perf_event.c	diff1 \|	diff2 \|	blob \| history
tools/perf/builtin-record.c	diff1 \|	diff2 \|	blob \| history