Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Jul 2008 20:11:01 +0000 (13:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Jul 2008 20:11:01 +0000 (13:11 -0700)
commitf8804d39462dc019ae9d1a6e4d45512e9dfec2bf
treee5c1626a5f9685c503293b5df0b50d636388b7c0
parenta26449daa285c858fc68991c1d585b6927702cf5
parente988cf1cfed4ed80bf40528e655fe18bed6a38b6
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:
  ocfs2: Fix flags in ocfs2_file_lock