Merge branch 'tip/x86/ftrace' of...
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
Showing
- arch/x86/include/asm/cacheflush.h 5 additions, 0 deletionsarch/x86/include/asm/cacheflush.h
- arch/x86/kernel/ftrace.c 17 additions, 0 deletionsarch/x86/kernel/ftrace.c
- arch/x86/kernel/vmiclock_32.c 4 additions, 1 deletionarch/x86/kernel/vmiclock_32.c
- arch/x86/mm/init_32.c 32 additions, 3 deletionsarch/x86/mm/init_32.c
- arch/x86/mm/init_64.c 32 additions, 5 deletionsarch/x86/mm/init_64.c
- arch/x86/mm/pageattr.c 5 additions, 10 deletionsarch/x86/mm/pageattr.c
- include/linux/ftrace.h 3 additions, 0 deletionsinclude/linux/ftrace.h
- kernel/trace/ftrace.c 32 additions, 1 deletionkernel/trace/ftrace.c
Loading
Please register or sign in to comment