36388b7c0
parent a26449daa285c858fc68991c1d585b6927702cf5
parent e988cf1cfed4ed80bf40528e655fe18bed6a38b6
author Linus Torvalds <torvalds@linux-foundation.org> 1215720661 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1215720661 -0700

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
˜«¤§™,x