From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 19 Oct 2012 18:00:00 +0000 (-0700)
Subject: Merge branch 'for-3.7' of git://linux-nfs.org/~bfields/linux
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=90cdb1a0e65db31eeb9afaec7d1d3d27e15ae900;p=openwrt%2Fstaging%2Fblogic.git

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

Pull nfsd bugfixes from J Bruce Fields.

* 'for-3.7' of git://linux-nfs.org/~bfields/linux:
  SUNRPC: Prevent kernel stack corruption on long values of flush
  NLM: nlm_lookup_file() may return NLMv4-specific error codes
---

90cdb1a0e65db31eeb9afaec7d1d3d27e15ae900