diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-27 10:25:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-27 10:25:02 -0700 |
| 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 572b5b20ba4..a6562ba1dc3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3726,7 +3726,7 @@ KEYS/KEYRINGS: M: David Howells <dhowells@redhat.com> L: keyrings@linux-nfs.org S: Maintained -F: Documentation/keys.txt +F: Documentation/security/keys.txt F: include/linux/key.h F: include/linux/key-type.h F: include/keys/ @@ -3738,7 +3738,7 @@ M: Mimi Zohar <zohar@us.ibm.com> L: linux-security-module@vger.kernel.org L: keyrings@linux-nfs.org S: Supported -F: Documentation/keys-trusted-encrypted.txt +F: Documentation/security/keys-trusted-encrypted.txt F: include/keys/trusted-type.h F: security/keys/trusted.c F: security/keys/trusted.h @@ -3749,7 +3749,7 @@ M: David Safford <safford@watson.ibm.com> L: linux-security-module@vger.kernel.org L: keyrings@linux-nfs.org S: Supported -F: Documentation/keys-trusted-encrypted.txt +F: Documentation/security/keys-trusted-encrypted.txt F: include/keys/encrypted-type.h F: security/keys/encrypted.c F: security/keys/encrypted.h |