Merge branch 'linus' into x86/paravirt-spinlocks
authorIngo Molnar <mingo@elte.hu>
Mon, 21 Jul 2008 13:05:58 +0000 (15:05 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 21 Jul 2008 13:05:58 +0000 (15:05 +0200)

Trivial merge