tree 865b308feea81c3c399669e9ec191a4cdad3265b
parent b924f9599dfd4a604761e84b1e920e480fb57f66
parent 8f6e8a314ab37cadd72da5ace9027f2d04aba854
author Linus Torvalds <torvalds@linux-foundation.org> 1255028769 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1255028769 -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:
  tracing: user local buffer variable for trace branch tracer
  tracing: fix warning on kernel/trace/trace_branch.c andtrace_hw_branches.c
  ftrace: check for failure for all conversions
  tracing: correct module boundaries for ftrace_release
  tracing: fix transposed numbers of lock_depth and preempt_count
  trace: Fix missing assignment in trace_ctxwake_*
  tracing: Use free_percpu instead of kfree
  tracing: Check total refcount before releasing bufs in profile_enable failure