Skip to content
GitLab
Explore
Sign in
Register
xenomai
ipipe-x86
Repository
ipipe-x86
kernel
trace
trace.c
Find file
Blame
History
Permalink
Merge branches 'tracing/ftrace', 'tracing/ring-buffer' and 'tracing/urgent' into tracing/core
· 30cd324e
Ingo Molnar
authored
Dec 19, 2008
Conflicts: include/linux/ftrace.h
30cd324e