diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-14 12:48:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-14 12:48:46 -0800 |
| commit | 8ba74517e4cc30e6fd92925fd134b820cbeb9249 (patch) | |
| tree | 266990814ef9e6ac3b35448bc25119be112a26d0 /include | |
| parent | bd3813d52d567ea6e85e70ce205770bfdafac368 (diff) | |
| parent | 2ec197db1a56c9269d75e965f14c344b58b2a4f6 (diff) | |
Merge branch 'for-3.14' of git://linux-nfs.org/~bfields/linux
Pull two nfsd bugfixes from Bruce Fields.
* 'for-3.14' of git://linux-nfs.org/~bfields/linux:
lockd: send correct lock when granting a delayed lock.
nfsd4: fix acl buffer overrun
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions