Merge branch 'linus' into tracing/sysprof
authorIngo Molnar <mingo@elte.hu>
Mon, 16 Jun 2008 09:17:19 +0000 (11:17 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 16 Jun 2008 09:17:19 +0000 (11:17 +0200)

Trivial merge