Merge branch 'linus' into x86/core
authorH. Peter Anvin <hpa@zytor.com>
Thu, 4 Sep 2008 15:09:09 +0000 (08:09 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Thu, 4 Sep 2008 15:09:09 +0000 (08:09 -0700)
1  2 
arch/x86/Kconfig
include/asm-x86/kvm_host.h

Simple merge
Simple merge