Merge branch 'linus' into x86/ptemask
authorIngo Molnar <mingo@elte.hu>
Mon, 16 Jun 2008 09:20:37 +0000 (11:20 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 16 Jun 2008 09:20:37 +0000 (11:20 +0200)

Trivial merge