linux/security
James Morris ab2b49518e Merge branch 'master' into next
Conflicts:

	MAINTAINERS

Thanks for breaking my tree :-)

Signed-off-by: James Morris <jmorris@namei.org>
2008-09-21 17:41:56 -07:00
..
keys keys: remove unused key_alloc_sem 2008-06-06 11:29:11 -07:00
selinux Merge branch 'master' into next 2008-09-21 17:41:56 -07:00
smack Merge branch 'master' into next 2008-08-28 10:47:34 +10:00
Kconfig securityfs: do not depend on CONFIG_SECURITY 2008-08-28 10:47:42 +10:00
Makefile securityfs: do not depend on CONFIG_SECURITY 2008-08-28 10:47:42 +10:00
capability.c security: Fix setting of PF_SUPERPRIV by __capable() 2008-08-14 22:59:43 +10:00
commoncap.c security: Fix setting of PF_SUPERPRIV by __capable() 2008-08-14 22:59:43 +10:00
device_cgroup.c devcgroup: fix race against rmdir() 2008-09-02 19:21:38 -07:00
inode.c security: add/fix security kernel-doc 2008-08-20 20:16:32 +10:00
root_plug.c security: Fix setting of PF_SUPERPRIV by __capable() 2008-08-14 22:59:43 +10:00
security.c Merge branch 'master' into next 2008-08-28 10:47:34 +10:00