]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0302336 09f9e20)
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)
commitd9b70c75b241739c3d6ddf38272bcf902d5459b0
tree39967f4bb9a35d626584bd46f1acd916c6b5278dtree | snapshot
parent0302336efb5cfb6d7e989b082ccf9800f689e755commit | diff
parent09f9e20c896b1460ba27f29f72cfffb21d95d6b0commit | 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
Linux Kernel Source Tree.