]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branches 'tracing/docs', 'tracing/filters', 'tracing/ftrace', 'tracing/kprobes...
authorIngo Molnar <mingo@elte.hu>
Tue, 31 Mar 2009 15:46:40 +0000 (17:46 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 31 Mar 2009 15:46:40 +0000 (17:46 +0200)
commit8b54e45b0005875f59cb8b1c44d429a161d5f245
tree0e7c98418384f3f773d2046eea50f529e89f1cba
parent0a5d649018b151cb9331c213a843ac4a3e7e44ab
parent9a8118baaeb0eaa148913bed77bf9c6335f6ca63
parentb14b70a6a4e394c9630bcde17e07d3bcdcbca27e
parentfee039a1d05c6e0f71b0fe270d847742a02d56c4
parent18cea4591a98817697017bcb056a848bae1205df
parent548c316137901cc81dea35e26362a9d5ba0b89b6
Merge branches 'tracing/docs', 'tracing/filters', 'tracing/ftrace', 'tracing/kprobes', 'tracing/blktrace-v2' and 'tracing/textedit' into tracing/core-v2
kernel/trace/ring_buffer.c
kernel/trace/trace.c
kernel/trace/trace.h