diff options
| author | Linus Torvalds <[email protected]> | 2011-03-01 01:52:47 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2011-03-01 01:52:47 +0000 |
| commit | 158a5d61f780b707da0b559cf60d72294006aa97 (patch) | |
| tree | f4e86dfdca114123f282ba9000ee7470844e91c0 /net/unix/af_unix.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiw... (diff) | |
| parent | ocfs2: Check heartbeat mode for kernel stacks only (diff) | |
| download | kernel-158a5d61f780b707da0b559cf60d72294006aa97.tar.gz kernel-158a5d61f780b707da0b559cf60d72294006aa97.zip | |
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 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions