Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 6 Jan 2010 00:01:04 +0000 (16:01 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 6 Jan 2010 00:01:04 +0000 (16:01 -0800)
commit6307daad8496f5807a2ef60cbada55fe3b59c44e
treefc2e3a56f89c445415fff1e9ce18312f7392b5b4
parentf843b0fcc70094d87fea8c7004937388c316ea7a
parent86470e98cc52532006f47a6cb96d3ebe1ba7ad97
Merge branch 'upstream-linus' of git://git./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.