From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 25 Apr 2014 19:39:05 +0000 (-0700)
Subject: Merge branch 'for-3.15' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: v3.15-rc3~16
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=b8e6dece3746902c29a4f0007c062641fa5dcc2d;p=linux.git

Merge branch 'for-3.15' of git://linux-nfs.org/~bfields/linux

Pull nfsd bugfixes from Bruce Fields:
 "Three small nfsd bugfixes (including one locks.c fix for a bug
  triggered only from nfsd).

  Jeff's patches are for long-existing problems that became easier to
  trigger since the addition of vfs delegation support"

* 'for-3.15' of git://linux-nfs.org/~bfields/linux:
  Revert "nfsd4: fix nfs4err_resource in 4.1 case"
  nfsd: set timeparms.to_maxval in setup_callback_client
  locks: allow __break_lease to sleep even when break_time is 0
---

b8e6dece3746902c29a4f0007c062641fa5dcc2d