tree e0a3fdfa3e7cb45e75727fe77558e64ec1bc9b4f
parent 411094acb70f171a111710cf32031c749ffdd28c
parent ed146b25942b428f8e8056587b7638ce76573c2f
author Linus Torvalds <torvalds@linux-foundation.org> 1257447385 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1257447385 -0800

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:
  ftrace: Fix unmatched locking in ftrace_regex_write()
  ring-buffer: Synchronize resizing buffer with reader lock