]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
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)
- Pull in patch 'NFSD: Implement SEEK' from Bruce's nfsd-next tree
  for dependencies.


Trivial merge