diff options
| author | Avi Kivity <avi@qumranet.com> | 2007-07-18 07:55:44 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@qumranet.com> | 2007-07-18 07:55:44 +0300 |
| commit | 45dff1900d4c3eb81e0a1ea8611c172e4a736088 (patch) | |
| tree | cc74c9ceef825dc254f4d0bd6205f716bbcc4407 /include/asm-ia64/tlb.h | |
| parent | 0dfb860def58bfb2daa000af490ed1986373fea5 (diff) | |
| parent | cb32da0416b823b7f4b65e7e85d6cba16ca4d1e1 (diff) | |
KVM: Merge remote branch 'origin/master'kvm-30
Conflicts:
drivers/kvm/kvm.h
drivers/kvm/kvm_main.c
drivers/kvm/mmu.c
drivers/kvm/svm.c
drivers/kvm/vmx.c
drivers/kvm/x86_emulate.c
Diffstat (limited to 'include/asm-ia64/tlb.h')
0 files changed, 0 insertions, 0 deletions