summaryrefslogtreecommitdiff
path: root/fs/nfsd/nfs2acl.c
diff options
context:
space:
mode:
authorJoerg Roedel <jroedel@suse.de>2016-07-26 17:02:37 +0300
committerJoerg Roedel <jroedel@suse.de>2016-07-26 17:02:37 +0300
commitf360d3241f5557f241d55b959e6e65070e77992e (patch)
tree3cc1966f4c832c104486f4200c4449641e9506bf /fs/nfsd/nfs2acl.c
parent523d939ef98fd712632d93a5a2b588e477a7565e (diff)
parentffec219770dadd32171e6dd927e1d83d3218529f (diff)
parent5c365d18a73d3979db37006eaacefc0008869c0f (diff)
parent6ae5343c26f9cba5e9ef8ba6f23b5bb255ebc798 (diff)
parent131bc8ebb46a84f93d90a6d95347cfb9402f58a3 (diff)
parent1cb13f78329ca2f1f7ef4e6024901cc26d611ee1 (diff)
parenta93db2f22b6b48369acb72f66a0ae47ec17a0b05 (diff)
parentc3928e75158e846a61369207ce417a0a9ce71a0f (diff)
parentfeccf398db631f3b98c4c6572381517d90b5fd87 (diff)
downloadlinux-f360d3241f5557f241d55b959e6e65070e77992e.tar.xz
Merge branches 'x86/amd', 'x86/vt-d', 'arm/exynos', 'arm/mediatek', 'arm/msm', 'arm/rockchip', 'arm/smmu' and 'core' into next