]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'linus' into tracing/urgent
authorIngo Molnar <mingo@elte.hu>
Mon, 14 Dec 2009 08:16:49 +0000 (09:16 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 14 Dec 2009 08:16:49 +0000 (09:16 +0100)
commit143c22d0c789f0462091546f9cecb86c54806be6
tree18779442274e81607822ecb0905c55ac4ce6a163
parent8326664d055b30e0c549ee1cd22131ba7386fb1e
parent698129eee0f5556f3eaf29bbbe71f449fcc99288
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
kernel/trace/trace_kprobe.c
kernel/trace/trace_ksym.c