]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 843adf2 4377245)
Merge branch 'tip/x86/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rosted...
authorIngo Molnar <mingo@elte.hu>
Sun, 22 Feb 2009 17:12:01 +0000 (18:12 +0100)
committerIngo Molnar <mingo@elte.hu>
Sun, 22 Feb 2009 17:12:01 +0000 (18:12 +0100)
commitc478f8786973d6d7552c652ddad3f6fd86b5af28
tree39967f4bb9a35d626584bd46f1acd916c6b5278dtree | snapshot
parent843adf2379c18ed9a1b7493ee208bfd5512732e0commit | diff
parent4377245aa93b65b6597e4b7bb460fb9abc48b56bcommit | diff
Merge branch 'tip/x86/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace

Conflicts:
include/linux/ftrace.h
kernel/trace/ftrace.c
arch/x86/kernel/ftrace.c diff1 | diff2 | blob | history
include/linux/ftrace.h diff1 | diff2 | blob | history
kernel/trace/ftrace.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.