aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-18 16:50:28 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-18 16:50:28 -0700
commit3f80fbff5f1ef8a842bbe5343bbc9ddad883f25c (patch)
tree259f5be0f203b5c7e97837a1957f461abcfef5d0 /Makefile
parentfce519588acfac249e8fdc1f5016c73d617de315 (diff)
parent24307aa1e707b31613be92deaba7990e16bc1aec (diff)
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: configfs: Fix race between configfs_readdir() and configfs_d_iput() configfs: Don't try to d_delete() negative dentries. ocfs2/dlm: Target node death during resource migration leads to thread spin ocfs2: Skip mount recovery for hard-ro mounts ocfs2/cluster: Heartbeat mismatch message improved ocfs2/cluster: Increase the live threshold for global heartbeat ocfs2/dlm: Use negotiated o2dlm protocol version ocfs2: skip existing hole when removing the last extent_rec in punching-hole codes. ocfs2: Initialize data_ac (might be used uninitialized)
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions