aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-10 14:18:59 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-10 14:18:59 -0500
commite0e736fc0d33861335e2a132e4f688f7fd380c61 (patch)
treed9febe9ca1ef1e24efc5e6e1e34e412316d246bd /MAINTAINERS
parenta08948812b30653eb2c536ae613b635a989feb6f (diff)
parentaeda4ac3efc29e4d55989abd0a73530453aa69ba (diff)
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 ...
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS3
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 03c516a1edfa..9e4d4ca690e2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5930,7 +5930,8 @@ F: drivers/net/tlan.*
5930TOMOYO SECURITY MODULE 5930TOMOYO SECURITY MODULE
5931M: Kentaro Takeda <takedakn@nttdata.co.jp> 5931M: Kentaro Takeda <takedakn@nttdata.co.jp>
5932M: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> 5932M: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
5933L: tomoyo-users-en@lists.sourceforge.jp (subscribers-only, for developers and users in English) 5933L: tomoyo-dev-en@lists.sourceforge.jp (subscribers-only, for developers in English)
5934L: tomoyo-users-en@lists.sourceforge.jp (subscribers-only, for users in English)
5934L: tomoyo-dev@lists.sourceforge.jp (subscribers-only, for developers in Japanese) 5935L: tomoyo-dev@lists.sourceforge.jp (subscribers-only, for developers in Japanese)
5935L: tomoyo-users@lists.sourceforge.jp (subscribers-only, for users in Japanese) 5936L: tomoyo-users@lists.sourceforge.jp (subscribers-only, for users in Japanese)
5936W: http://tomoyo.sourceforge.jp/ 5937W: http://tomoyo.sourceforge.jp/