Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Wed, 18 Feb 2009 00:08:13 +0000 (01:08 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 18 Feb 2009 00:08:13 +0000 (01:08 +0100)
commit37bd824a35a60abc73e5fa8816bd5f50c913d69b
treee6f718191893ccb713f854fc8bf4a5866a41fe2b
parent73d3fd96e77745742f3750b7b19ee42204adc210
parent5b058bcde961bf28678a70e44c079107313543b6
Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core
kernel/trace/ftrace.c