diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-16 12:27:25 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-16 12:27:25 -0800 |
commit | 6ccc347b699681a0b21c2f7b1a1f85500a58c6b8 (patch) | |
tree | abe33c75ae53d445abde0e5986b96ef696501d38 /drivers/rapidio | |
parent | eb29a5cc0b601c458bae9df2f6c3696d75c2d383 (diff) | |
parent | d1303dd1d6b220cab375f24fa91a5640e54e169e (diff) | |
download | blackbird-op-linux-6ccc347b699681a0b21c2f7b1a1f85500a58c6b8.tar.gz blackbird-op-linux-6ccc347b699681a0b21c2f7b1a1f85500a58c6b8.zip |
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:
tracing/filters: Add comment for match callbacks
tracing/filters: Fix MATCH_FULL filter matching for PTR_STRING
tracing/filters: Fix MATCH_MIDDLE_ONLY filter matching
lib: Introduce strnstr()
tracing/filters: Fix MATCH_END_ONLY filter matching
tracing/filters: Fix MATCH_FRONT_ONLY filter matching
ftrace: Fix MATCH_END_ONLY function filter
tracing/x86: Derive arch from bits argument in recordmcount.pl
ring-buffer: Add rb_list_head() wrapper around new reader page next field
ring-buffer: Wrap a list.next reference with rb_list_head()
Diffstat (limited to 'drivers/rapidio')
0 files changed, 0 insertions, 0 deletions