diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-13 14:36:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-13 14:36:19 -0700 |
| commit | 9e766d81b1f432826fd773fc5d679b8a8095e941 (patch) | |
| tree | c61e6035d460188e72ecde235ce5d34d9a475950 /arch/parisc/Makefile | |
| parent | bf6239eb84e6d7331f168cd3593958b656ce42a3 (diff) | |
| parent | 4f018c513a81ba243165bfc4fcf44254986ad002 (diff) | |
Merge branch 'kvm-updates/2.6.34' of git://git.kernel.org/pub/scm/virt/kvm/kvm
* 'kvm-updates/2.6.34' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: PPC: Keep index within boundaries in kvmppc_44x_emul_tlbwe()
KVM: VMX: blocked-by-sti must not defer NMI injections
KVM: x86: Call vcpu_load and vcpu_put in cpuid_update
KVM: SVM: Fix wrong intercept masks on 32 bit
KVM: convert ioapic lock to spinlock
Diffstat (limited to 'arch/parisc/Makefile')
0 files changed, 0 insertions, 0 deletions