From 2315cce7a2fce821d973246c5cc3bff57d158b18 Mon Sep 17 00:00:00 2001
From: Peter Meerwald <pmeerw@pmeerw.net>
Date: Sat, 18 Aug 2012 17:38:54 +0200
Subject: [PATCH] --- yaml --- r: 323401 b: refs/heads/master c:
 1856b225ca1f80446938c9ec4a0b330c1772ec45 h: refs/heads/master i:   323399:
 d57c62fe993ec99b016536be594b361b86ad8ecd v: v3

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

diff --git a/[refs] b/[refs]
index f4f7f4110dab..f12a7fd4575e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8421ed81df02c99b4c084a4fe0ab28d0056243c0
+refs/heads/master: 1856b225ca1f80446938c9ec4a0b330c1772ec45
diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c
index 8b2a2977b720..120d8e98ee5f 100644
--- a/trunk/fs/nfs/super.c
+++ b/trunk/fs/nfs/super.c
@@ -1590,7 +1590,7 @@ static int nfs_parse_mount_options(char *raw,
 
 	/*
 	 * verify that any proto=/mountproto= options match the address
-	 * familiies in the addr=/mountaddr= options.
+	 * families in the addr=/mountaddr= options.
 	 */
 	if (protofamily != AF_UNSPEC &&
 	    protofamily != mnt->nfs_server.address.ss_family)