From b3ccc765eaa2193553a1b0d7dfa96d7575735e99 Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Sun, 14 Nov 2010 17:05:00 +0000
Subject: [PATCH] --- yaml --- r: 224179 b: refs/heads/master c:
 8a22c99a80b0926585cfcbcc423ee2c49c1fd820 h: refs/heads/master i:   224177:
 de14bf2be59123f50732a7ac5046549d3290112c   224175:
 997e9b25d8fc2fcd3a0578157b231bd5d84f3966 v: v3

---
 [refs]                 | 2 +-
 trunk/net/ipv6/mcast.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 274e301f0506..0bf0d83c5ab5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d577f1ccdd8ae8bfbe6063eb2ba2a350259e9031
+refs/heads/master: 8a22c99a80b0926585cfcbcc423ee2c49c1fd820
diff --git a/trunk/net/ipv6/mcast.c b/trunk/net/ipv6/mcast.c
index d1444b95ad7e..9c5074528a71 100644
--- a/trunk/net/ipv6/mcast.c
+++ b/trunk/net/ipv6/mcast.c
@@ -257,7 +257,7 @@ static struct inet6_dev *ip6_mc_find_dev_rcu(struct net *net,
 		return NULL;
 	idev = __in6_dev_get(dev);
 	if (!idev)
-		return NULL;;
+		return NULL;
 	read_lock_bh(&idev->lock);
 	if (idev->dead) {
 		read_unlock_bh(&idev->lock);