Merge branch 'linus' into tracing/mmiotrace-mergefixups
authorIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:28:47 +0000 (12:28 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:28:47 +0000 (12:28 +0200)

Trivial merge