summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-06-06 20:31:55 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-06-06 20:31:55 +0200
commit156a9ea43acb609ac89d48dbb9f0d05ee903a12e (patch)
tree0b470e783c6f5012421a9a59aa8864c5fcc96407 /MAINTAINERS
parentMerge git://git.infradead.org/~dwmw2/mtd-2.6.26 (diff)
parentcapabilities: remain source compatible with 32-bit raw legacy capability supp... (diff)
downloadlinux-156a9ea43acb609ac89d48dbb9f0d05ee903a12e.tar.xz
linux-156a9ea43acb609ac89d48dbb9f0d05ee903a12e.zip
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--MAINTAINERS1
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
P: Chris Wright
M: chrisw@sous-sol.org
L: linux-security-module@vger.kernel.org
-W: http://lsm.immunix.org
T: git kernel.org:/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git
S: Supported