Merge branch 'linus' into tracing/urgent
authorIngo Molnar <mingo@elte.hu>
Thu, 24 Jul 2008 06:09:26 +0000 (08:09 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 24 Jul 2008 06:09:26 +0000 (08:09 +0200)

Trivial merge