Merge branch 'linus' into tracing/mmiotrace
authorIngo Molnar <mingo@elte.hu>
Mon, 7 Jul 2008 06:07:35 +0000 (08:07 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 7 Jul 2008 06:07:35 +0000 (08:07 +0200)

Trivial merge