tree 1d4b3447cb2a7407d97e51ee5c48069d6b92c9e3
parent 5bb241b325d7d91bc4ec0b394f31dffb17fe7978
parent 115e8a288252ef748f34f8b7c1115c563d702eda
author Linus Torvalds <torvalds@linux-foundation.org> 1253985234 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1253985234 -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:
  modules, tracing: Remove stale struct marker signature from module_layout()
  tracing/workqueue: Use %pf in workqueue trace events
  tracing: Fix a comment and a trivial format issue in tracepoint.h
  tracing: Fix failure path in ftrace_regex_open()
  tracing: Fix failure path in ftrace_graph_write()
  tracing: Check the return value of trace_get_user()
  tracing: Fix off-by-one in trace_get_user()