diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-19 14:00:00 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-19 14:00:00 -0400 |
| commit | 90cdb1a0e65db31eeb9afaec7d1d3d27e15ae900 (patch) | |
| tree | aa859ee7750f7904007520087637ecf8f940cfad /net/bridge/br_stp_timer.c | |
| 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
Diffstat (limited to 'net/bridge/br_stp_timer.c')
0 files changed, 0 insertions, 0 deletions