From: Trond Myklebust <trond.myklebust@primarydata.com>
Date: Tue, 30 Sep 2014 20:23:39 +0000 (-0400)
Subject: Merge commit '24bab491220f' into client-4.2
X-Git-Tag: v3.18-rc1~21^2~4^2~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4a3a0ebad1360696125bf34d89de55d71c4d0eaa;p=users%2Fjedix%2Flinux-maple.git

Merge commit '24bab491220f' into client-4.2

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

4a3a0ebad1360696125bf34d89de55d71c4d0eaa