commit dfae359f083fac3a884e10b46ebe0f262a9bd97a
author Linus Torvalds <torvalds@linux-foundation.org> Wed May 16 14:22:38 2012 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Wed May 16 14:22:38 2012 -0700
tree 25a547a4cb2b1cdac99766c62442c1f73bc50582
parent 39d6411b7df566715138c8c9f7fa00227f4ae75b
parent 531c8ff0d472295f5ef5d1bd306115c81a84889e

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"

fs/cifs/connect.c

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 5dcc551..e0b56d7 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -164,7 +164,8 @@
 	{ Opt_sign, "sign" },
 	{ Opt_seal, "seal" },
 	{ Opt_direct, "direct" },
-	{ Opt_direct, "forceddirectio" },
+	{ Opt_direct, "directio" },
+	{ Opt_direct, "forcedirectio" },
 	{ Opt_strictcache, "strictcache" },
 	{ Opt_noac, "noac" },
 	{ Opt_fsc, "fsc" },