Merge branch 'linus' into x86/x2apic
authorIngo Molnar <mingo@elte.hu>
Fri, 18 Jul 2008 20:50:34 +0000 (22:50 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 18 Jul 2008 20:50:34 +0000 (22:50 +0200)

Trivial merge