You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David S. Miller 1b63ba8a86 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/wireless/iwlwifi/iwl4965-base.c		17 years ago
..
Kconfig	…
Makefile	…
af_unix.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	17 years ago
garbage.c	[AF_UNIX]: Convert socks to unix_socks in scan_inflight, not in callbacks	17 years ago
sysctl_net_unix.c	[NETNS]: struct net content re-work (v3)	17 years ago