diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-14 21:48:46 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-14 21:48:46 +0100 |
commit | 8ba74517e4cc30e6fd92925fd134b820cbeb9249 (patch) | |
tree | 266990814ef9e6ac3b35448bc25119be112a26d0 /Documentation/kmemleak.txt | |
parent | Merge tag 'md/3.14-fixes' of git://neil.brown.name/md (diff) | |
parent | lockd: send correct lock when granting a delayed lock. (diff) | |
download | linux-8ba74517e4cc30e6fd92925fd134b820cbeb9249.tar.xz linux-8ba74517e4cc30e6fd92925fd134b820cbeb9249.zip |
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 'Documentation/kmemleak.txt')
0 files changed, 0 insertions, 0 deletions