diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-27 17:25:02 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-27 17:25:02 (GMT) |
commit | e52e713ec30a31e9a4663d9aebbaae5ec07466a6 (patch) | |
tree | 68f9680577ae68f3972a5ed73afed5d1c2794310 /include | |
parent | bdf7cf1c83872a0586ce4c4da6889103cc36dbd3 (diff) | |
parent | 2f3e4af471e38e0658e701973238ae4b5e50fcd6 (diff) | |
download | linux-fsl-qoriq-e52e713ec30a31e9a4663d9aebbaae5ec07466a6.tar.xz |
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 'include')
-rw-r--r-- | include/linux/cred.h | 2 | ||||
-rw-r--r-- | include/linux/key.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/cred.h b/include/linux/cred.h index be16b61..8260799 100644 --- a/include/linux/cred.h +++ b/include/linux/cred.h @@ -1,4 +1,4 @@ -/* Credentials management - see Documentation/credentials.txt +/* Credentials management - see Documentation/security/credentials.txt * * Copyright (C) 2008 Red Hat, Inc. All Rights Reserved. * Written by David Howells (dhowells@redhat.com) diff --git a/include/linux/key.h b/include/linux/key.h index ef19b99..6ea4eeb 100644 --- a/include/linux/key.h +++ b/include/linux/key.h @@ -9,7 +9,7 @@ * 2 of the License, or (at your option) any later version. * * - * See Documentation/keys.txt for information on keys/keyrings. + * See Documentation/security/keys.txt for information on keys/keyrings. */ #ifndef _LINUX_KEY_H |