Public Git Hosting - linux-2.6/cjktty.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 39dc78b c86e2ea c5659b7)

commit	0ffa798d947f5f5e40690cc9d38e678080a34f87
author	Ingo Molnar <mingo@elte.hu>
	Sun, 15 Nov 2009 08:51:19 +0000 (15 09:51 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Sun, 15 Nov 2009 08:51:24 +0000 (15 09:51 +0100)
tree	a9e25ba4431de513d4c83201429e9ff301cbaf50	tree \| snapshot (tar.gz zip)
parent	39dc78b6510323848e3356452f7dab9499736978	commit \| diff
parent	c86e2eaded39843e1bf4f07d1adfab4494f20894	commit \| diff
parent	c5659b74f052150791750234f92dcfb29d27efa5	commit \| diff

Merge branches 'perf/powerpc' and 'perf/bench' into perf/core

Merge reason: Both 'perf bench' and the pending PowerPC changes
are now ready for the next merge window.

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

arch/powerpc/kernel/entry_64.S	diff1 \|	diff2 \|	diff3 \|	blob \| history
arch/powerpc/kernel/perf_event.c	diff1 \|	diff2 \|	diff3 \|	blob \| history
arch/powerpc/kernel/time.c	diff1 \|	diff2 \|	diff3 \|	blob \| history
include/linux/perf_counter.h	diff1 \|	diff2 \|	diff3 \|	blob \| history
include/linux/perf_event.h	diff1 \|	diff2 \|	diff3 \|	blob \| history
kernel/perf_event.c	diff1 \|	diff2 \|	diff3 \|	blob \| history
tools/perf/Makefile	diff1 \|	diff2 \|	diff3 \|	blob \| history
tools/perf/perf.c	diff1 \|	diff2 \|	diff3 \|	blob \| history
tools/perf/util/parse-events.c	diff1 \|	diff2 \|	diff3 \|	blob \| history

CJK support for tty framebuffer vt