git.karo-electronics.de Git - mv-sheeva.git/commit

]> git.karo-electronics.de Git - mv-sheeva.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	6c869e772c72d509d0db243a56c205ef48a29baf
tree	9a290f1742526a8816f94560cb09bc0a09c910de	tree \| snapshot
parent	e4e91ac410356da3a518188f371e9d3b52ee38ee	commit \| diff
parent	ee6dcfa40a50fe12a3ae0fb4d2653c66c3ed6556	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 for Marvell Sheeva based platforms

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