Merge remote branch 'origin/x86/urgent' into x86/asm
authorH. Peter Anvin <hpa@zytor.com>
Wed, 28 Jul 2010 06:28:28 +0000 (23:28 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Wed, 28 Jul 2010 06:28:28 +0000 (23:28 -0700)
1  2 
arch/x86/kvm/x86.c

Simple merge