diff options
author | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-09-30 16:23:39 -0400 |
---|---|---|
committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-09-30 16:23:39 -0400 |
commit | 4a3a0ebad1360696125bf34d89de55d71c4d0eaa (patch) | |
tree | 12bc1bb6c8b6121a1ba30423a5b27fb91cba0a39 /fs/nfsd/fault_inject.c | |
parent | 2ce7598c9a453e0acd0e07be7be3f5eb39608ebd (diff) | |
parent | 24bab491220faa446d945624086d838af41d616c (diff) | |
download | linux-4a3a0ebad1360696125bf34d89de55d71c4d0eaa.tar.gz linux-4a3a0ebad1360696125bf34d89de55d71c4d0eaa.tar.bz2 linux-4a3a0ebad1360696125bf34d89de55d71c4d0eaa.zip |
Merge commit '24bab491220f' into client-4.2
- Pull in patch 'NFSD: Implement SEEK' from Bruce's nfsd-next tree
for dependencies.
Diffstat (limited to 'fs/nfsd/fault_inject.c')
0 files changed, 0 insertions, 0 deletions