diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-05 10:56:25 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-05 10:56:25 -0800 |
commit | 72cc129e8dae988d2a132467cfd0ecd7623c35fb (patch) | |
tree | e0a3fdfa3e7cb45e75727fe77558e64ec1bc9b4f /arch/x86 | |
parent | 411094acb70f171a111710cf32031c749ffdd28c (diff) | |
parent | ed146b25942b428f8e8056587b7638ce76573c2f (diff) |
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
Diffstat (limited to 'arch/x86')
0 files changed, 0 insertions, 0 deletions