torvalds/linux
3
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-04-05 14:09:10 +08:00
Code Issues Packages Projects Releases Wiki Activity
Files
8d26487fd4ddda7a0237da418fb8669fb06ae557
linux/kernel/trace/ring_buffer.c
Ingo Molnar 9676e73a9e Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core 
Conflicts:
	kernel/trace/ftrace.c

[ We conflicted here because we backported a few fixes to
  tracing/urgent - which has different internal APIs. ]
2008-11-19 10:04:25 +01:00

53 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink