From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 6 Jan 2010 00:01:04 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec... 
X-Git-Tag: v2.6.33-rc3~3
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=6307daad8496f5807a2ef60cbada55fe3b59c44e;p=safe%2Fjmp%2Flinux-2.6

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.
---

6307daad8496f5807a2ef60cbada55fe3b59c44e