git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 4c49b12 156171c)

author	Ingo Molnar <mingo@elte.hu>
	Sun, 15 Nov 2009 08:50:38 +0000 (09:50 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Sun, 15 Nov 2009 08:50:41 +0000 (09:50 +0100)
commit	39dc78b6510323848e3356452f7dab9499736978
tree	cf8a8fede74e41b203fd00e3ccd21ead2e851442	tree \| snapshot
parent	4c49b12853fbb5eff4849b7b6a1e895776f027a1	commit \| diff
parent	156171c71a0dc4bce12b4408bb1591f8fe32dc1a	commit \| diff

Merge commit 'v2.6.32-rc7' into perf/core

Merge reason: pick up perf fixlets

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

kernel/trace/ftrace.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/ring_buffer.c	diff1 \|	diff2 \|	blob \| history
tools/perf/builtin-record.c	diff1 \|	diff2 \|	blob \| history
tools/perf/builtin-top.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree