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: 79e406d 57c072c)

author	Ingo Molnar <mingo@elte.hu>
	Wed, 15 Sep 2010 08:27:31 +0000 (10:27 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Wed, 15 Sep 2010 08:27:31 +0000 (10:27 +0200)
commit	3aabae7d9dfaed60effe93662f02c19bafc18537
tree	af94cdd69add07601d9f3f5988dfc1dc255e3886	tree \| snapshot (tar.bz2 tar.gz zip)
parent	79e406d7b00ab2b261ae32a59f266fd3b7af6f29	commit \| diff
parent	57c072c7113f54f9512624d6c665db6184448782	commit \| diff

Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core

arch/alpha/kernel/perf_event.c	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/perf_event.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/ftrace.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/ring_buffer.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
tools/perf/util/symbol.c	diff1 \|	diff2 \|	blob \| history
tools/perf/util/symbol.h	diff1 \|	diff2 \|	blob \| history

Clone of davem's net-next-2.6 tree