From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 5 Nov 2009 18:56:25 +0000 (-0800)
Subject: Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: MMI-PSA29.97-13-9~25964
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=72cc129e8dae988d2a132467cfd0ecd7623c35fb;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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
---

72cc129e8dae988d2a132467cfd0ecd7623c35fb