From 22ad79b252b38df3df9d70b293e46c14fec6491e Mon Sep 17 00:00:00 2001
From: Olga Kornievskaia <aglo@citi.umich.edu>
Date: Wed, 13 Feb 2008 16:47:06 -0500
Subject: [PATCH] --- yaml --- r: 85671 b: refs/heads/master c:
 8d042218b075de3cdbe066198515b3521553746e h: refs/heads/master i:   85669:
 cc7c9cf7d6aad96623e49440e0472f645a6b4fdf   85667:
 6521cdd7a5b1218f4f6d22357d46bceb5bc86a46   85663:
 2cd5cea9467333d093cba1f4f5e16b8ee85fdf5a v: v3

---
 [refs]               | 2 +-
 trunk/fs/nfs/super.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a6c3886511d3..441a929f2b95 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25606656b19a38bbece914c4c67101f674908f49
+refs/heads/master: 8d042218b075de3cdbe066198515b3521553746e
diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c
index 7f4505f6ac6f..1fb381843650 100644
--- a/trunk/fs/nfs/super.c
+++ b/trunk/fs/nfs/super.c
@@ -190,6 +190,10 @@ static match_table_t nfs_secflavor_tokens = {
 	{ Opt_sec_lkeyi, "lkeyi" },
 	{ Opt_sec_lkeyp, "lkeyp" },
 
+	{ Opt_sec_spkm, "spkm3" },
+	{ Opt_sec_spkmi, "spkm3i" },
+	{ Opt_sec_spkmp, "spkm3p" },
+
 	{ Opt_sec_err, NULL }
 };