| commit | b72e9ebe7efa5754aa53bbdb0040a2d6eeb34db3 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Wed, 9 Jul 2008 04:48:26 +0000 (8 21:48 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Wed, 9 Jul 2008 04:48:26 +0000 (8 21:48 -0700) | ||
| tree | ac9ae8efb9109a17e3633409aaa245100f97c425 | treesnapshot (tar.gz zip) |
| parent | ba0fc709e197415aadd46b9ec208dc4abaa21edd | commitdiff |
| parent | 18c6ac383f3e46cfce08d0bf972705852a4e1268 | commitdiff |
Merge branch 'upstream-linus' of git://git./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()
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
[PATCH] ocfs2/dlm: Fixes oops in dlm_new_lockres()