| commit | b72e9ebe7efa5754aa53bbdb0040a2d6eeb34db3 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jul 08 21:48:26 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jul 08 21:48:26 2008 -0700 |
| tree | ac9ae8efb9109a17e3633409aaa245100f97c425 | |
| parent | ba0fc709e197415aadd46b9ec208dc4abaa21edd [diff] | |
| parent | 18c6ac383f3e46cfce08d0bf972705852a4e1268 [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: [PATCH] ocfs2/dlm: Fixes oops in dlm_new_lockres()