James Morris 2b82892565 Merge branch 'master' into next ... Conflicts: security/keys/internal.h security/keys/process_keys.c security/keys/request_key.c Fixed conflicts above by using the non 'tsk' versions. Signed-off-by: James Morris <jmorris@namei.org>		2008-11-14 11:29:12 +11:00
..
af_unix.c	Merge branch 'master' into next	2008-11-14 11:29:12 +11:00
garbage.c	net: unix: fix inflight counting bug in garbage collector	2008-11-09 11:17:33 -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