From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 9 Jul 2008 04:48:26 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe... 
X-Git-Tag: v2.6.26~38
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b72e9ebe7efa5754aa53bbdb0040a2d6eeb34db3;p=linux-2.6

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()
---

b72e9ebe7efa5754aa53bbdb0040a2d6eeb34db3