Merge branch 'linus' into x86/core
authorIngo Molnar <mingo@elte.hu>
Thu, 14 Aug 2008 12:58:01 +0000 (14:58 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 14 Aug 2008 12:58:01 +0000 (14:58 +0200)
Conflicts:
arch/x86/kernel/genapic_64.c
include/asm-x86/kvm_host.h

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

Trivial merge