Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/lin… · git-mirror/linux@da74ff0 · GitHub

Commit

Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/lin…

Browse files

…ux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace

Conflicts:
	kernel/sched_clock.c

Loading branch information

Ingo Molnar committed Feb 27, 2009

2 parents f701d35 + 5c6a3ae commit da74ff0