tree 8b5c67249a7a163caf3f88cbcb9df5236fcc3b93
parent b3727c24da69971503a4ca98b3b877753c6a4393
parent 583a22e7c154dc0a3938db522696b4bc7f098f59
author Linus Torvalds <torvalds@linux-foundation.org> 1253549147 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1253549147 -0700

Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  kernel/profile.c: Switch /proc/irq/prof_cpu_mask to seq_file
  tracing: Export trace_profile_buf symbols
  tracing/events: use list_for_entry_continue
  tracing: remove max_tracer_type_len
  function-graph: use ftrace_graph_funcs directly
  tracing: Remove markers
  tracing: Allocate the ftrace event profile buffer dynamically
  tracing: Factorize the events profile accounting