| commit | e5c465f5d957ab581bc79d3ce981281fe73021a3 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Wed Mar 28 14:02:03 2007 -0700 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Wed Mar 28 14:02:03 2007 -0700 |
| tree | d37f808b94d0cb46e88108d422da2c22deb721b7 | |
| parent | d0a9af809124c432297a7c4a3bcf98cbfdb4036a [diff] | |
| parent | 2f5bf1f2d061dea5146aa283685ce2b00cea2f3d [diff] |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2: ocfs2_dlm: Check for migrateable lockres in dlm_empty_lockres() ocfs2_dlm: Fix lockres ref counting bug