review.tizen.org Git - profile/common/kernel-common.git/commit

projects / profile / common / kernel-common.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 16620e0 f405425)

author	Ingo Molnar <mingo@elte.hu>
	Mon, 14 Dec 2009 08:16:49 +0000 (09:16 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Mon, 14 Dec 2009 08:16:49 +0000 (09:16 +0100)
commit	cc0104e877fff32865a67b256d3a9ce52ff15790
tree	18779442274e81607822ecb0905c55ac4ce6a163	tree \| snapshot
parent	16620e0f1990fa6d896a639449c4b3d678458464	commit \| diff
parent	f40542532e96dda5506eb76badea322f2ae4731c	commit \| diff

Merge branch 'linus' into tracing/urgent

Conflicts:
kernel/trace/trace_kprobe.c

Merge reason: resolve the conflict.

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

include/linux/syscalls.h	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_kprobe.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_ksym.c	diff1 \|	diff2 \|	blob \| history

Domain: SCM / Uncategorized;