David S. Miller 0344f1c66b Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:

	net/mac80211/tx.c

2008-06-19 16:00:04 -07:00

..

af_unix.c

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

2008-06-19 16:00:04 -07:00

garbage.c

[AF_UNIX]: Convert socks to unix_socks in scan_inflight, not in callbacks

2007-11-10 22:07:13 -08:00

Kconfig

[NET]: move config options out to individual protocols

2005-07-11 21:13:56 -07:00

Makefile

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

sysctl_net_unix.c

[NETNS]: struct net content re-work (v3)

2008-01-28 14:57:14 -08:00