diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-28 17:52:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-28 17:52:47 -0800 |
| commit | 158a5d61f780b707da0b559cf60d72294006aa97 (patch) | |
| tree | f4e86dfdca114123f282ba9000ee7470844e91c0 /fs/nfsd/nfsproc.c | |
| parent | c4319c7db8c3805e4811eaceeee6c2fa51411bd4 (diff) | |
| parent | 52c303c56c3638944b5f733e3961dc58eb8c7270 (diff) | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
ocfs2: Check heartbeat mode for kernel stacks only
Ocfs2/refcounttree: Fix a bug for refcounttree to writeback clusters in a right number.
ocfs2: Fix estimate of necessary credits for mkdir
Diffstat (limited to 'fs/nfsd/nfsproc.c')
0 files changed, 0 insertions, 0 deletions