Merge branch 'tracing/fastboot' into tracing/ftrace
authorIngo Molnar <mingo@elte.hu>
Thu, 6 Nov 2008 06:43:47 +0000 (07:43 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 6 Nov 2008 06:43:47 +0000 (07:43 +0100)

Trivial merge