commit | 90cdb1a0e65db31eeb9afaec7d1d3d27e15ae900 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Oct 19 11:00:00 2012 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Oct 19 11:00:00 2012 -0700 |
tree | aa859ee7750f7904007520087637ecf8f940cfad | |
parent | d479c911789e14a19b86ca09b0b634f1449c8c6b [diff] | |
parent | 212ba90696ab4884e2025b0b13726d67aadc2cd4 [diff] |
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