summaryrefslogtreecommitdiffstats
path: root/kernel/taskstats.c
diff options
context:
space:
mode:
authorLinus Torvalds2010-08-13 19:43:50 +0200
committerLinus Torvalds2010-08-13 19:43:50 +0200
commita30bfd6cd47f387e060fb06d2ba688a491e6eaec (patch)
tree041f5d4ec714b573c2ed68c501b2dddca5cc4cba /kernel/taskstats.c
parentMerge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff)
parentO2net: Disallow o2net accept connection request from itself. (diff)
downloadkernel-qcow2-linux-a30bfd6cd47f387e060fb06d2ba688a491e6eaec.tar.gz
kernel-qcow2-linux-a30bfd6cd47f387e060fb06d2ba688a491e6eaec.tar.xz
kernel-qcow2-linux-a30bfd6cd47f387e060fb06d2ba688a491e6eaec.zip
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: O2net: Disallow o2net accept connection request from itself. ocfs2/dlm: remove potential deadlock -V3 ocfs2/dlm: avoid incorrect bit set in refmap on recovery master Fix the nested PR lock calling issue in ACL ocfs2: Count more refcount records in file system fragmentation. ocfs2 fix o2dlm dlm run purgelist (rev 3) ocfs2/dlm: fix a dead lock ocfs2: do not overwrite error codes in ocfs2_init_acl
Diffstat (limited to 'kernel/taskstats.c')
0 files changed, 0 insertions, 0 deletions