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

Conflicts:
	net/mac80211/main.c

2010-09-09 22:27:33 -07:00

..

af_unix.c

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

2010-09-09 22:27:33 -07:00

garbage.c

unix/garbage: kill copy of the skb queue walker

2010-05-03 15:39:58 -07: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

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00