diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-07 09:53:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-07 09:53:33 -0700 |
| commit | a3fac08085136fb8b56bbd290500ed03c94ee5d1 (patch) | |
| tree | 849f73fd0d7d8d519735ad0eb3b4931c7c27aac4 /drivers/net/wireless/ath/ath9k/rc.c | |
| parent | 664481ed45cdbda2ab853ddd3c2690b69aca9103 (diff) | |
| parent | e08759215b7dcb7111e94f0f96918dd98e86ca6b (diff) | |
Merge branch 'kvm-updates/3.4' of git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull a few KVM fixes from Avi Kivity:
"A bunch of powerpc KVM fixes, a guest and a host RCU fix (unrelated),
and a small build fix."
* 'kvm-updates/3.4' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: Resolve RCU vs. async page fault problem
KVM: VMX: vmx_set_cr0 expects kvm->srcu locked
KVM: PMU: Fix integer constant is too large warning in kvm_pmu_set_msr()
KVM: PPC: Book3S: PR: Fix preemption
KVM: PPC: Save/Restore CR over vcpu_run
KVM: PPC: Book3S HV: Save and restore CR in __kvmppc_vcore_entry
KVM: PPC: Book3S HV: Fix kvm_alloc_linear in case where no linears exist
KVM: PPC: Book3S: Compile fix for ppc32 in HIOR access code
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/rc.c')
0 files changed, 0 insertions, 0 deletions