diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-06 14:31:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-06 14:31:55 -0400 |
| commit | 156a9ea43acb609ac89d48dbb9f0d05ee903a12e (patch) | |
| tree | 0b470e783c6f5012421a9a59aa8864c5fcc96407 /MAINTAINERS | |
| parent | c8d10bffdbea5f82a8e491467a23fb2cc7da921b (diff) | |
| parent | ca05a99a54db1db5bca72eccb5866d2a86f8517f (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6:
capabilities: remain source compatible with 32-bit raw legacy capability support.
LSM: remove stale web site from MAINTAINERS
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ae1dab8603f8..a1930260c33f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -2565,7 +2565,6 @@ LINUX SECURITY MODULE (LSM) FRAMEWORK | |||
| 2565 | P: Chris Wright | 2565 | P: Chris Wright |
| 2566 | M: chrisw@sous-sol.org | 2566 | M: chrisw@sous-sol.org |
| 2567 | L: linux-security-module@vger.kernel.org | 2567 | L: linux-security-module@vger.kernel.org |
| 2568 | W: http://lsm.immunix.org | ||
| 2569 | T: git kernel.org:/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git | 2568 | T: git kernel.org:/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git |
| 2570 | S: Supported | 2569 | S: Supported |
| 2571 | 2570 | ||