| commit | f8804d39462dc019ae9d1a6e4d45512e9dfec2bf | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jul 10 13:11:01 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jul 10 13:11:01 2008 -0700 |
| tree | e5c1626a5f9685c503293b5df0b50d636388b7c0 | |
| parent | a26449daa285c858fc68991c1d585b6927702cf5 [diff] | |
| parent | e988cf1cfed4ed80bf40528e655fe18bed6a38b6 [diff] |
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