Merge branch 'linus' into tracing/urgent
authorIngo Molnar <mingo@elte.hu>
Tue, 18 Nov 2008 20:37:07 +0000 (21:37 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 18 Nov 2008 20:37:07 +0000 (21:37 +0100)

Trivial merge