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

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 5f29805 d949750)

author	Ingo Molnar <mingo@elte.hu>
	Thu, 16 Dec 2010 10:22:25 +0000 (11:22 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Thu, 16 Dec 2010 10:22:27 +0000 (11:22 +0100)
commit	006b20fe4c69189b0d854e5eabf269e50ca86cdd
tree	948b08825a36114c85ddc2bfcd965c261e32810f	tree \| snapshot
parent	5f29805a4f4627e766f862ff9f10c14f5f314359	commit \| diff
parent	d949750fed168b6553ca11ed19e4affd19d7a4d7	commit \| diff

Merge branch 'perf/urgent' into perf/core

Merge reason: We want to apply a dependent patch.

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

include/linux/perf_event.h	diff1 \|	diff2 \|	blob \| history
kernel/perf_event.c	diff1 \|	diff2 \|	blob \| history
tools/perf/builtin-record.c	diff1 \|	diff2 \|	blob \| history
tools/perf/util/header.c	diff1 \|	diff2 \|	blob \| history
tools/perf/util/symbol.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree