diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-19 10:28:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-19 10:28:59 -0700 |
| commit | 9e01297ee1ada71e621c8b58a80a28a421a00471 (patch) | |
| tree | b62959354c0b514d95b9829b8395aae12869d3e0 /include/rdma/ib_fmr_pool.h | |
| parent | 9b7f43afd417a6feb80841d30ced4051c362eb5d (diff) | |
| parent | 21a1416a1c945c5aeaeaf791b63c64926018eb77 (diff) | |
Merge git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull KVM updates from Marcelo Tosatti.
* git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: lock slots_lock around device assignment
KVM: VMX: Fix kvm_set_shared_msr() called in preemptible context
KVM: unmap pages from the iommu when slots are removed
KVM: PMU emulation: GLOBAL_CTRL MSR should be enabled on reset
Diffstat (limited to 'include/rdma/ib_fmr_pool.h')
0 files changed, 0 insertions, 0 deletions