diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-27 13:25:02 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-27 13:25:02 -0400 |
commit | e52e713ec30a31e9a4663d9aebbaae5ec07466a6 (patch) | |
tree | 68f9680577ae68f3972a5ed73afed5d1c2794310 /MAINTAINERS | |
parent | bdf7cf1c83872a0586ce4c4da6889103cc36dbd3 (diff) | |
parent | 2f3e4af471e38e0658e701973238ae4b5e50fcd6 (diff) |
Merge branch 'docs-move' of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs
* 'docs-move' of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs:
Create Documentation/security/, move LSM-, credentials-, and keys-related files from Documentation/ to Documentation/security/, add Documentation/security/00-INDEX, and update all occurrences of Documentation/<moved_file> to Documentation/security/<moved_file>.
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 572b5b20ba48..a6562ba1dc35 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -3726,7 +3726,7 @@ KEYS/KEYRINGS: | |||
3726 | M: David Howells <dhowells@redhat.com> | 3726 | M: David Howells <dhowells@redhat.com> |
3727 | L: keyrings@linux-nfs.org | 3727 | L: keyrings@linux-nfs.org |
3728 | S: Maintained | 3728 | S: Maintained |
3729 | F: Documentation/keys.txt | 3729 | F: Documentation/security/keys.txt |
3730 | F: include/linux/key.h | 3730 | F: include/linux/key.h |
3731 | F: include/linux/key-type.h | 3731 | F: include/linux/key-type.h |
3732 | F: include/keys/ | 3732 | F: include/keys/ |
@@ -3738,7 +3738,7 @@ M: Mimi Zohar <zohar@us.ibm.com> | |||
3738 | L: linux-security-module@vger.kernel.org | 3738 | L: linux-security-module@vger.kernel.org |
3739 | L: keyrings@linux-nfs.org | 3739 | L: keyrings@linux-nfs.org |
3740 | S: Supported | 3740 | S: Supported |
3741 | F: Documentation/keys-trusted-encrypted.txt | 3741 | F: Documentation/security/keys-trusted-encrypted.txt |
3742 | F: include/keys/trusted-type.h | 3742 | F: include/keys/trusted-type.h |
3743 | F: security/keys/trusted.c | 3743 | F: security/keys/trusted.c |
3744 | F: security/keys/trusted.h | 3744 | F: security/keys/trusted.h |
@@ -3749,7 +3749,7 @@ M: David Safford <safford@watson.ibm.com> | |||
3749 | L: linux-security-module@vger.kernel.org | 3749 | L: linux-security-module@vger.kernel.org |
3750 | L: keyrings@linux-nfs.org | 3750 | L: keyrings@linux-nfs.org |
3751 | S: Supported | 3751 | S: Supported |
3752 | F: Documentation/keys-trusted-encrypted.txt | 3752 | F: Documentation/security/keys-trusted-encrypted.txt |
3753 | F: include/keys/encrypted-type.h | 3753 | F: include/keys/encrypted-type.h |
3754 | F: security/keys/encrypted.c | 3754 | F: security/keys/encrypted.c |
3755 | F: security/keys/encrypted.h | 3755 | F: security/keys/encrypted.h |