diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-27 10:47:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-27 10:47:29 -0700 |
| commit | a205752d1ad2d37d6597aaae5a56fc396a770868 (patch) | |
| tree | 1def76b02da90b98cefd66c4ba3904697963c358 /MAINTAINERS | |
| parent | 39bc89fd4019b164002adaacef92c4140e37955a (diff) | |
| parent | e900a7d90ae1486ac95c10e0b7337fc2c2eda529 (diff) | |
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: preserve boolean values across policy reloads
selinux: change numbering of boolean directory inodes in selinuxfs
selinux: remove unused enumeration constant from selinuxfs
selinux: explicitly number all selinuxfs inodes
selinux: export initial SID contexts via selinuxfs
selinux: remove userland security class and permission definitions
SELinux: move security_skb_extlbl_sid() out of the security server
MAINTAINERS: update selinux entry
SELinux: rename selinux_netlabel.h to netlabel.h
SELinux: extract the NetLabel SELinux support from the security server
NetLabel: convert a BUG_ON in the CIPSO code to a runtime check
NetLabel: cleanup and document CIPSO constants
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 2e83c82aa13d..5519d257b556 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2980,8 +2980,10 @@ P: Stephen Smalley M: sds@tycho.nsa.gov P: James Morris M: jmorris@namei.org +P: Eric Paris +M: eparis@parisplace.org L: linux-kernel@vger.kernel.org (kernel issues) -L: selinux@tycho.nsa.gov (general discussion) +L: selinux@tycho.nsa.gov (subscribers-only, general discussion) W: http://www.nsa.gov/selinux S: Supported |