bbs.cooldavid.org Git - net-next-2.6.git/commit

]> bbs.cooldavid.org Git - net-next-2.6.git/commit

git://bbs.cooldavid.org / net-next-2.6.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 7be7923 018378c)

author	Ingo Molnar <mingo@elte.hu>
	Wed, 9 Jun 2010 16:55:20 +0000 (18:55 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Wed, 9 Jun 2010 16:55:57 +0000 (18:55 +0200)
commit	c726b61c6a5acc54c55ed7a0e7638cc4c5a100a8
tree	3f44aa013d31d34951e9610e79ff14c1148ad6ac	tree \| snapshot (tar.bz2 tar.gz zip)
parent	7be7923633a142402266d642ccebf74f556a649b	commit \| diff
parent	018378c55b03f88ff513aba4e0e93b8d4a9cf241	commit \| diff

Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/perf_event.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/perf_event.c	diff1 \|	diff2 \|	blob \| history
include/linux/perf_event.h	diff1 \|	diff2 \|	blob \| history
include/linux/slub_def.h	diff1 \|	diff2 \|	blob \| history
include/trace/ftrace.h	diff1 \|	diff2 \|	blob \| history
kernel/perf_event.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.h	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_event_perf.c	diff1 \|	diff2 \|	blob \| history
mm/slub.c	diff1 \|	diff2 \|	blob \| history

Clone of davem's net-next-2.6 tree