tree ae71fcbd8b3640b68fc11e1dca620a8ee96bac5f
parent 554f786e284a6ce859d51f62240d615603944c8e
parent 480c93df5b99699390f93a7024c9f60d09da0e96
author Steven Rostedt <srostedt@redhat.com> 1236906766 -0400
committer Steven Rostedt <srostedt@redhat.com> 1236906766 -0400

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