Merge branch 'pnfs'
authorTrond Myklebust <trond.myklebust@primarydata.com>
Sun, 24 Jul 2016 21:08:59 +0000 (17:08 -0400)
committerTrond Myklebust <trond.myklebust@primarydata.com>
Sun, 24 Jul 2016 21:08:59 +0000 (17:08 -0400)
commit668f455dac57050e33a43ff5fe006f6cd947fc65
tree46198f7e5f200bac7be319f9a5f003aebb18e600
parent362745268ce119c473952b30f57d947bdede7f7a
parent01d7b29f0edc1a19ff2b960dae1c7dade3bb1753
Merge branch 'pnfs'
fs/nfs/nfs42proc.c
fs/nfs/nfs4proc.c
fs/nfs/pnfs.c
fs/nfs/pnfs.h