aboutsummaryrefslogtreecommitdiff
path: root/fs/ncpfs/ncp_fs_sb.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-02-25 15:59:37 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-25 15:59:37 -0800
commit8d168f71551ec2a6528d01d0389b7a73c091e3e7 (patch)
treefd90ed4b806cfb5b5f5c44172b667024598769f7 /fs/ncpfs/ncp_fs_sb.h
parent32dc43e40a2707d0cb1ab8768d080c3e9bcfed52 (diff)
parent3b8cd8a015f3db85624c0fdb591956aed7f61b65 (diff)
downloadvexpress-lsk-8d168f71551ec2a6528d01d0389b7a73c091e3e7.tar.gz
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/ncpfs/ncp_fs_sb.h')
0 files changed, 0 insertions, 0 deletions