tree ae2d43366b946ab0968762a2b68cc862983db372
parent bf20753c0cdf842c5c65af688c2cefd1eafa7630
parent 44e9c8b7adc52079f0535f9de0c2c2477831389b
author Linus Torvalds <torvalds@linux-foundation.org> 1239647488 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1239647488 -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/filters: return proper error code when writing filter file
  tracing/filters: allow user input integer to be oct or hex
  tracing/filters: fix NULL pointer dereference
  tracing/filters: NIL-terminate user input filter
  ftrace: Output REC->var instead of __entry->var for trace format
  Make __stringify support variable argument macros too
  tracing: fix document references
  tracing: fix splice return too large
  tracing: update file->f_pos when splice(2) it
  tracing: allocate page when needed
  tracing: disable seeking for trace_pipe_raw