Merge branch 'linus' into x86/urgent
authorIngo Molnar <mingo@elte.hu>
Sat, 26 Jul 2008 09:26:19 +0000 (11:26 +0200)
committerIngo Molnar <mingo@elte.hu>
Sat, 26 Jul 2008 09:26:19 +0000 (11:26 +0200)

Trivial merge