From: Linus Torvalds 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: firefly_0821_release~9833^2~3478 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6307daad8496f5807a2ef60cbada55fe3b59c44e;p=firefly-linux-kernel-4.4.55.git 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