projects
/
platform
/
kernel
/
linux-stable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
20ebb34
49a068f
)
Merge branch 'for-3.19' of git://linux-nfs.org/~bfields/linux
author
Linus Torvalds
<torvalds@linux-foundation.org>
Sat, 10 Jan 2015 02:10:48 +0000
(18:10 -0800)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Sat, 10 Jan 2015 02:10:48 +0000
(18:10 -0800)
Pull two nfsd bugfixes from Bruce Fields.
* 'for-3.19' of git://linux-nfs.org/~bfields/linux:
rpc: fix xdr_truncate_encode to handle buffer ending on page boundary
nfsd: fix fi_delegees leak when fi_had_conflict returns true
Trivial merge