| commit | 6307daad8496f5807a2ef60cbada55fe3b59c44e | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jan 05 16:01:04 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jan 05 16:01:04 2010 -0800 |
| tree | fc2e3a56f89c445415fff1e9ce18312f7392b5b4 | |
| parent | f843b0fcc70094d87fea8c7004937388c316ea7a [diff] | |
| parent | 86470e98cc52532006f47a6cb96d3ebe1ba7ad97 [diff] |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: ocfs2: Handle O_DIRECT when writing to a refcounted cluster.