tree dcd5c7a70a04f89448cffd408a1743f90f41e7a6
parent 76429f1dedbc1815d875c9b68eefd30c95cb8fa9
parent fc208d026be0c7d60db9118583fc62f6ca97743d
author Linus Torvalds <torvalds@linux-foundation.org> 1398454745 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1398454745 -0700

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