Linus Torvalds 3296ca27f5 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 ... * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (44 commits) nommu: Provide mmap_min_addr definition. TOMOYO: Add description of lists and structures. TOMOYO: Remove unused field. integrity: ima audit dentry_open failure TOMOYO: Remove unused parameter. security: use mmap_min_addr indepedently of security models TOMOYO: Simplify policy reader. TOMOYO: Remove redundant markers. SELinux: define audit permissions for audit tree netlink messages TOMOYO: Remove unused mutex. tomoyo: avoid get+put of task_struct smack: Remove redundant initialization. integrity: nfsd imbalance bug fix rootplug: Remove redundant initialization. smack: do not beyond ARRAY_SIZE of data integrity: move ima_counts_get integrity: path_check update IMA: Add __init notation to ima functions IMA: Minimal IMA policy and boot param for TCB IMA policy selinux: remove obsolete read buffer limit from sel_read_bool ...		2009-06-11 10:01:41 -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	SELinux: define audit permissions for audit tree netlink messages	2009-06-03 07:44:53 +10: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	lsm: Remove the socket_post_accept() hook	2009-03-28 15:01:37 +11:00
commoncap.c	Merge branch 'master' into next	2009-05-08 17:56:47 +10:00
device_cgroup.c	devcgroup: avoid using cgroup_lock	2009-04-02 19:04:55 -07:00
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