diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-26 00:59:37 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-26 00:59:37 +0100 |
| commit | 8d168f71551ec2a6528d01d0389b7a73c091e3e7 (patch) | |
| tree | fd90ed4b806cfb5b5f5c44172b667024598769f7 /fs/nfsd/nfs4xdr.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (diff) | |
| parent | ARM: KVM: fix compilation after removal of user_alloc from struct kvm_memory_... (diff) | |
| download | linux-8d168f71551ec2a6528d01d0389b7a73c091e3e7.tar.xz linux-8d168f71551ec2a6528d01d0389b7a73c091e3e7.zip | |
Merge git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull KVM ARM compile fixes from Gleb Natapov:
"Fix ARM KVM compilation breakage due to changes from kvm.git"
* git://git.kernel.org/pub/scm/virt/kvm/kvm:
ARM: KVM: fix compilation after removal of user_alloc from struct kvm_memory_slot
ARM: KVM: Rename KVM_MEMORY_SLOTS -> KVM_USER_MEM_SLOTS
ARM: KVM: fix kvm_arch_{prepare,commit}_memory_region
Diffstat (limited to 'fs/nfsd/nfs4xdr.c')
0 files changed, 0 insertions, 0 deletions