Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts: arch/microblaze/include/asm/socket.h
2009-08-12 17:44:53 -07:00
parent 07f6642ee9 9799218ae3
commit aa11d958d1
1599 changed files with 38227 additions and 25978 deletions
--- a/net/econet/af_econet.c
+++ b/net/econet/af_econet.c
@@ -520,6 +520,7 @@ static int econet_getname(struct socket *sock, struct sockaddr *uaddr,
 	if (peer)
 		return -EOPNOTSUPP;

+	memset(sec, 0, sizeof(*sec));
 	mutex_lock(&econet_mutex);

 	sk = sock->sk;