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

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 40b7e05 220bf99)

author	Ingo Molnar <mingo@elte.hu>
	Mon, 22 Mar 2010 17:46:57 +0000 (18:46 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Mon, 22 Mar 2010 17:47:01 +0000 (18:47 +0100)
commit	d2f1e15b661e71fd52111f51c99a6ce41384e9ef
tree	8731e7e772e6f825ebbc6eef7681bc46302149bd	tree \| snapshot
parent	40b7e05e17eef31ff30fe08dfc2424ef653a792c	commit \| diff
parent	220bf991b0366cc50a94feede3d7341fa5710ee4	commit \| diff

Merge commit 'v2.6.34-rc2' into perf/core

Merge reason: Pick up latest perf fixes from upstream.

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

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
tools/perf/perf.c	diff1 \|	diff2 \|	blob \| history
tools/perf/util/hist.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree