David S. Miller 9cbc1cb8cd Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: Documentation/feature-removal-schedule.txt drivers/scsi/fcoe/fcoe.c net/core/drop_monitor.c net/core/net-traces.c		2009-06-15 03:02:23 -07:00
..
integrity/ima	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6	2009-06-11 10:01:41 -07:00
keys	keys: Handle there being no fallback destination keyring for request_key()	2009-04-09 10:41:19 -07:00
selinux	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
smack	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6	2009-06-11 10:01:41 -07:00
tomoyo	TOMOYO: Add description of lists and structures.	2009-06-09 09:30:24 +10:00
capability.c
commoncap.c	Merge branch 'master' into next	2009-05-08 17:56:47 +10:00
device_cgroup.c
inode.c	securityfs: securityfs_remove should handle IS_ERR pointers	2009-05-12 11:06:11 +10:00
Kconfig	security: use mmap_min_addr indepedently of security models	2009-06-04 12:07:48 +10:00
lsm_audit.c	smack: implement logging V3	2009-04-14 09:00:19 +10:00
Makefile	smack: implement logging V3	2009-04-14 09:00:23 +10:00
root_plug.c	rootplug: Remove redundant initialization.	2009-05-27 13:30:46 +10:00
security.c	security: use mmap_min_addr indepedently of security models	2009-06-04 12:07:48 +10:00