Merge branch 'linus' into x86/x2apic
authorIngo Molnar <mingo@elte.hu>
Tue, 22 Jul 2008 07:06:21 +0000 (09:06 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 22 Jul 2008 07:06:21 +0000 (09:06 +0200)

Trivial merge