The following commit has been merged in the linux branch: commit 72cc129e8dae988d2a132467cfd0ecd7623c35fb Merge: 411094acb70f171a111710cf32031c749ffdd28c ed146b25942b428f8e8056587b7638ce76573c2f Author: Linus Torvalds torvalds@linux-foundation.org Date: Thu Nov 5 10:56:25 2009 -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