From a8614e7aa8209f336f18629b03fe887a79ba85a8 Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@redhat.com>
Date: Wed, 2 May 2012 14:02:40 -0400
Subject: [PATCH] --- yaml --- r: 300049 b: refs/heads/master c:
 a557b97616c49d81e09c8439831d4c4f13ef4050 h: refs/heads/master i:   300047:
 e4da3d2ae483e0b0a0e8cdfab4473f48f911e649 v: v3

---
 [refs]                  | 2 +-
 trunk/fs/cifs/connect.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7322f7f6796d..77f7d54b9c0e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f966424e9935900e34cace8116d37aa70cff23d0
+refs/heads/master: a557b97616c49d81e09c8439831d4c4f13ef4050
diff --git a/trunk/fs/cifs/connect.c b/trunk/fs/cifs/connect.c
index a75902b28bf9..5dcc55197fb3 100644
--- a/trunk/fs/cifs/connect.c
+++ b/trunk/fs/cifs/connect.c
@@ -215,6 +215,8 @@ static const match_table_t cifs_mount_option_tokens = {
 
 	{ Opt_ignore, "cred" },
 	{ Opt_ignore, "credentials" },
+	{ Opt_ignore, "cred=%s" },
+	{ Opt_ignore, "credentials=%s" },
 	{ Opt_ignore, "guest" },
 	{ Opt_ignore, "rw" },
 	{ Opt_ignore, "ro" },