Commits
Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core Conflicts: kernel/trace/ring_buffer.c
Showing diff toc1e7abbc7af
Ingo Molnar committed d844222a54cMerge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core
Steven Rostedt committed 3e89c7bb92fring-buffer: clean up warn ons Impact: Restructure WARN_ONs in ring_buffer.c The curr...- Ingo Molnar committed c1e7abbc7afMMerge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6...