diff options
| author | James Morris <jmorris@namei.org> | 2008-10-09 20:09:47 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-10-09 20:09:47 -0400 |
| commit | 9ac684fc38cf17fbd25c0c9e388713c5ddfa3b14 (patch) | |
| tree | f2715b294d64efe1c5788f4fa5f0b25cdff071a7 /MAINTAINERS | |
| parent | 3fa8749e584b55f1180411ab1b51117190bac1e5 (diff) | |
| parent | 81990fbdd18b9cfdc93dc221ff3250f81468aed8 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 8dae4555f10e..7a03bd5a91a3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -3649,8 +3649,9 @@ M: jmorris@namei.org | |||
| 3649 | P: Eric Paris | 3649 | P: Eric Paris |
| 3650 | M: eparis@parisplace.org | 3650 | M: eparis@parisplace.org |
| 3651 | L: linux-kernel@vger.kernel.org (kernel issues) | 3651 | L: linux-kernel@vger.kernel.org (kernel issues) |
| 3652 | L: selinux@tycho.nsa.gov (subscribers-only, general discussion) | 3652 | L: selinux@tycho.nsa.gov (subscribers-only, general discussion) |
| 3653 | W: http://www.nsa.gov/selinux | 3653 | W: http://selinuxproject.org |
| 3654 | T: git kernel.org:pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git | ||
| 3654 | S: Supported | 3655 | S: Supported |
| 3655 | 3656 | ||
| 3656 | SENSABLE PHANTOM | 3657 | SENSABLE PHANTOM |