Merge branches 'tracing/blktrace', 'tracing/ftrace', 'tracing/urgent' and 'linus...
authorIngo Molnar <mingo@elte.hu>
Wed, 4 Feb 2009 19:45:41 +0000 (20:45 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 4 Feb 2009 19:45:41 +0000 (20:45 +0100)
commitce70a0b472e06feae3a580ecb3fbef1e1e020a9b
tree46e8a2ef0c91fae86a735ee08add6cd6519ee74f
parent939b366977d29b5c0d53d1ea3b0b8cefb1e76202
parent79fb0768fbd371f3b94d909f51f587b3a24ab272
parent229c4ef8ae56d69f8dec64533bf1c7f8070c1a4a
Merge branches 'tracing/blktrace', 'tracing/ftrace', 'tracing/urgent' and 'linus' into tracing/core
kernel/trace/ftrace.c
kernel/trace/trace.c