Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Nov 2009 18:56:25 +0000 (10:56 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Nov 2009 18:56:25 +0000 (10:56 -0800)
commit72cc129e8dae988d2a132467cfd0ecd7623c35fb
treee0a3fdfa3e7cb45e75727fe77558e64ec1bc9b4f
parent411094acb70f171a111710cf32031c749ffdd28c
parented146b25942b428f8e8056587b7638ce76573c2f
Merge branch 'tracing-fixes-for-linus' of git://git./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