Merge branch 'linus' into x86/paravirt-spinlocks
authorIngo Molnar <mingo@elte.hu>
Fri, 18 Jul 2008 11:41:27 +0000 (13:41 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 18 Jul 2008 11:41:27 +0000 (13:41 +0200)
Conflicts:

arch/x86/kernel/Makefile

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Trivial merge