Linus Torvalds e0e736fc0d 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: (30 commits) MAINTAINERS: Add tomoyo-dev-en ML. SELinux: define permissions for DCB netlink messages encrypted-keys: style and other cleanup encrypted-keys: verify datablob size before converting to binary trusted-keys: kzalloc and other cleanup trusted-keys: additional TSS return code and other error handling syslog: check cap_syslog when dmesg_restrict Smack: Transmute labels on specified directories selinux: cache sidtab_context_to_sid results SELinux: do not compute transition labels on mountpoint labeled filesystems This patch adds a new security attribute to Smack called SMACK64EXEC. It defines label that is used while task is running. SELinux: merge policydb_index_classes and policydb_index_others selinux: convert part of the sym_val_to_name array to use flex_array selinux: convert type_val_to_struct to flex_array flex_array: fix flex_array_put_ptr macro to be valid C SELinux: do not set automatic i_ino in selinuxfs selinux: rework security_netlbl_secattr_to_sid SELinux: standardize return code handling in selinuxfs.c SELinux: standardize return code handling in selinuxfs.c SELinux: standardize return code handling in policydb.c ...		2011-01-10 11:18:59 -08:00
..
apparmor	headers: kobject.h redux	2011-01-10 08:51:44 -08:00
integrity/ima	ima: fix add LSM rule bug	2011-01-03 16:36:33 -08:00
keys	Merge branch 'master' into next	2011-01-10 09:46:24 +11:00
selinux	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6	2011-01-10 11:18:59 -08:00
smack	Merge branch 'master' into next	2011-01-10 09:46:24 +11:00
tomoyo	fs: dcache scale d_unhashed	2011-01-07 17:50:21 +11:00
capability.c	af_unix: Avoid socket->sk NULL OOPS in stream connect security hooks.	2011-01-05 15:38:53 -08:00
commoncap.c
device_cgroup.c
inode.c
Kconfig	keys: add new key-type encrypted	2010-11-29 08:55:29 +11:00
lsm_audit.c
Makefile
min_addr.c
security.c	Merge branch 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin	2011-01-07 08:56:33 -08:00