Merge commit '24bab491220f' into client-4.2
authorTrond Myklebust <trond.myklebust@primarydata.com>
Tue, 30 Sep 2014 20:23:39 +0000 (16:23 -0400)
committerTrond Myklebust <trond.myklebust@primarydata.com>
Tue, 30 Sep 2014 20:23:39 +0000 (16:23 -0400)
commit4a3a0ebad1360696125bf34d89de55d71c4d0eaa
tree12bc1bb6c8b6121a1ba30423a5b27fb91cba0a39
parent2ce7598c9a453e0acd0e07be7be3f5eb39608ebd
parent24bab491220faa446d945624086d838af41d616c
Merge commit '24bab491220f' into client-4.2

- Pull in patch 'NFSD: Implement SEEK' from Bruce's nfsd-next tree
  for dependencies.