tree fc2e3a56f89c445415fff1e9ce18312f7392b5b4
parent f843b0fcc70094d87fea8c7004937388c316ea7a
parent 86470e98cc52532006f47a6cb96d3ebe1ba7ad97
author Linus Torvalds <torvalds@linux-foundation.org> 1262736064 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1262736064 -0800

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.