diff options
| author | Avi Kivity <avi@qumranet.com> | 2008-04-27 22:25:49 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@qumranet.com> | 2008-04-27 22:25:49 +0300 |
| commit | 558a7fd737ee43753c95e7b70537d6eb47cc3965 (patch) | |
| tree | 4989173d2a95f39f8f52492279b8446ecadccdb5 /arch/x86/kvm/vmx.h | |
| parent | 27593fbc685ba6e464a8f7819bebfad1656527b5 (diff) | |
| parent | 064922a805ec7aadfafdd27aa6b4908d737c3c1d (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/powerpc/kvm/Kconfig
arch/s390/kvm/kvm-s390.c
include/asm-powerpc/kvm_para.h
include/asm-s390/kvm.h
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'arch/x86/kvm/vmx.h')
0 files changed, 0 insertions, 0 deletions