From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 10 Jan 2015 02:10:48 +0000 (-0800)
Subject: Merge branch 'for-3.19' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: fixes-v4.0-rc1~325
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc9319f5a3e1f67d2a2fbf190e30f6d03f569fed;p=pandora-kernel.git

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

Pull two nfsd bugfixes from Bruce Fields.

* 'for-3.19' of git://linux-nfs.org/~bfields/linux:
  rpc: fix xdr_truncate_encode to handle buffer ending on page boundary
  nfsd: fix fi_delegees leak when fi_had_conflict returns true
---

dc9319f5a3e1f67d2a2fbf190e30f6d03f569fed