kernel-ark/security
Trond Myklebust 816724e65c Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:

	fs/nfs/inode.c
	fs/super.c

Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'
2006-06-24 13:07:53 -04:00
..
keys
selinux [PATCH] SELinux: add task_movememory hook 2006-06-23 07:42:54 -07:00
capability.c
commoncap.c
dummy.c [PATCH] SELinux: add task_movememory hook 2006-06-23 07:42:54 -07:00
inode.c Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ 2006-06-24 13:07:53 -04:00
Kconfig
Makefile
root_plug.c
seclvl.c
security.c