diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-24 11:02:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-24 11:02:09 -0700 |
| commit | 104452f052dfcf62dbf0c4110c9234a3285f59bf (patch) | |
| tree | 9d508bbacb7d41286b21eeae4c1d6b222bcc361e /fs/ocfs2 | |
| parent | 08d49c46cf61f707f3f44228b362947bb57343e7 (diff) | |
| parent | 081f323bd3cc3a4d5ee6276e53cc52eddfc20a63 (diff) | |
Merge git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull KVM fixes from Avi Kivity:
"Fixing a scheduling-while-atomic bug in the ppc code, and a bug which
allowed pci bridges to be assigned to guests."
* git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: PPC: Book3S HV: Drop locks around call to kvmppc_pin_guest_page
KVM: Fix PCI header check on device assignment
Diffstat (limited to 'fs/ocfs2')
0 files changed, 0 insertions, 0 deletions