From cca2fac72622ca60d90f5a3bc9a7ed59d392c1b0 Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Mon, 21 Apr 2008 22:17:12 +0000
Subject: [PATCH] --- yaml --- r: 91743 b: refs/heads/master c:
 5309fbcc475084e6c1566084f770cef927937b7b h: refs/heads/master i:   91741:
 94040744ab99c1bfa82d0a937f007cd369eb8ad9   91739:
 a544eba946eed2591629d2cb8afada7d33ce9792   91735:
 cb5f648cdd05c4c87e4bd1166d7c33b56981fc0f   91727:
 d09df7a1c1fd78e20b5f2144863780f93dd58207   91711:
 e9644d62263341636fc22a886acab8212c755ba8 v: v3

---
 [refs]                | 2 +-
 trunk/net/core/sock.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7ade3273b56d..93c608b78063 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f5264481c8049673e2cc8c7aca410931f571ba2d
+refs/heads/master: 5309fbcc475084e6c1566084f770cef927937b7b
diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c
index 54c836a2216b..5ac052693554 100644
--- a/trunk/net/core/sock.c
+++ b/trunk/net/core/sock.c
@@ -942,7 +942,6 @@ static void sk_prot_free(struct proto *prot, struct sock *sk)
  *	@family: protocol family
  *	@priority: for allocation (%GFP_KERNEL, %GFP_ATOMIC, etc)
  *	@prot: struct proto associated with this new sock instance
- *	@zero_it: if we should zero the newly allocated sock
  */
 struct sock *sk_alloc(struct net *net, int family, gfp_t priority,
 		      struct proto *prot)