From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 4 Jul 2014 01:33:22 +0000 (-0700)
Subject: Merge branch 'for-3.16' of git://linux-nfs.org/~bfields/linux
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0fba687f9b7ebf5fb028fb8b0a4733b891986bd3;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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

Pull nfsd bugfixes from Bruce Fields:
 "By coincidence, two NFSv4 symlink bugs, one introduced in the 3.16 xdr
  encoding rewrite, the other a decoding bug that I think we've had
  since the start but that just doesn't trigger very often"

* 'for-3.16' of git://linux-nfs.org/~bfields/linux:
  nfs: fix nfs4d readlink truncated packet
  nfsd: fix rare symlink decoding bug
---

0fba687f9b7ebf5fb028fb8b0a4733b891986bd3