Merge branch 'linus' into x86/memtest
authorIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:31:14 +0000 (12:31 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:31:14 +0000 (12:31 +0200)

Trivial merge