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