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

Trivial merge