lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Conflicts:

	drivers/net/wireless/ath5k/base.c
	net/8021q/vlan_core.c
This commit is contained in:
David S. Miller
2008-11-06 22:43:03 -08:00
parent 61c9eaf900 4bab0ea1d4
commit 9eeda9abd1
739 changed files with 7279 additions and 6648 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/unix/af_unix.c
View File

@ -2212,7 +2212,7 @@ static int unix_net_init(struct net *net)
#endif
error = 0;
out:
return 0;
return error;
}
static void unix_net_exit(struct net *net)