From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 10 Jul 2008 20:11:01 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe... 
X-Git-Tag: v2.6.26~28
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f8804d39462dc019ae9d1a6e4d45512e9dfec2bf;p=linux-2.6-omap-h63xx.git

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: Fix flags in ocfs2_file_lock
---

f8804d39462dc019ae9d1a6e4d45512e9dfec2bf