Merge branch 'linus' into x86/urgent
authorIngo Molnar <mingo@elte.hu>
Fri, 18 Jul 2008 10:20:23 +0000 (12:20 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 18 Jul 2008 10:20:23 +0000 (12:20 +0200)

Trivial merge