From: Linus Torvalds Date: Wed, 16 May 2012 21:22:38 +0000 (-0700) Subject: Merge git://git.samba.org/sfrench/cifs-2.6 X-Git-Tag: upstream/snapshot3+hdmi~7514 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dfae359f083fac3a884e10b46ebe0f262a9bd97a;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git Merge git://git.samba.org/sfrench/cifs-2.6 Pull CIFS fix from Jeff Layton * git://git.samba.org/sfrench/cifs-2.6: cifs: fix misspelling of "forcedirectio" --- dfae359f083fac3a884e10b46ebe0f262a9bd97a