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

Trivial merge