Merge branch 'for-3.7' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Oct 2012 18:00:00 +0000 (11:00 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Oct 2012 18:00:00 +0000 (11:00 -0700)
commit90cdb1a0e65db31eeb9afaec7d1d3d27e15ae900
treeaa859ee7750f7904007520087637ecf8f940cfad
parentd479c911789e14a19b86ca09b0b634f1449c8c6b
parent212ba90696ab4884e2025b0b13726d67aadc2cd4
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