Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace

Browse source

Conflicts:
	kernel/sched_clock.c

...

This commit is contained in:

Ingo Molnar 2009-02-27 09:06:11 +01:00

parent f701d35407 5c6a3ae1b4

commit da74ff0f9b

1 changed files with 333 additions and 35 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

368

kernel/trace/trace.c

View file