Linus Torvalds cfd299dffe Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6 ... * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6: SELinux: Fix a RCU free problem with the netport cache SELinux: Made netnode cache adds faster SELinux: include/security.h whitespace, syntax, and other cleanups SELinux: policydb.h whitespace, syntax, and other cleanups SELinux: mls_types.h whitespace, syntax, and other cleanups SELinux: mls.h whitespace, syntax, and other cleanups SELinux: hashtab.h whitespace, syntax, and other cleanups SELinux: context.h whitespace, syntax, and other cleanups SELinux: ss/conditional.h whitespace, syntax, and other cleanups SELinux: selinux/include/security.h whitespace, syntax, and other cleanups SELinux: objsec.h whitespace, syntax, and other cleanups SELinux: netlabel.h whitespace, syntax, and other cleanups SELinux: avc_ss.h whitespace, syntax, and other cleanups Fixed up conflict in include/linux/security.h manually		2008-04-28 10:08:49 -07:00
..
keys	security: replace remaining __FUNCTION__ occurrences	2008-04-18 20:26:07 +10:00
selinux	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6	2008-04-28 10:08:49 -07:00
smack	smack: use cap_task_prctl	2008-04-28 08:58:27 -07:00
Kconfig	security: enhance DEFAULT_MMAP_MIN_ADDR description	2008-04-18 20:26:18 +10:00
Makefile	Smack: Simplified Mandatory Access Control Kernel	2008-02-05 09:44:20 -08:00
capability.c	capabilities: implement per-process securebits	2008-04-28 08:58:26 -07:00
commoncap.c	capabilities: implement per-process securebits	2008-04-28 08:58:26 -07:00
dummy.c	capabilities: implement per-process securebits	2008-04-28 08:58:26 -07:00
inode.c	Kobject: convert remaining kobject_unregister() to kobject_put()	2008-01-24 20:40:40 -08:00
root_plug.c	root_plug: use cap_task_prctl	2008-04-28 08:58:27 -07:00
security.c	capabilities: implement per-process securebits	2008-04-28 08:58:26 -07:00