Merge branch 'tracing/ftrace' into tracing/urgent
authorIngo Molnar <mingo@elte.hu>
Wed, 22 Oct 2008 07:08:14 +0000 (09:08 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 22 Oct 2008 07:08:14 +0000 (09:08 +0200)

Trivial merge