diff options
| author | James Morris <jmorris@namei.org> | 2011-11-16 12:39:48 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-11-16 12:39:48 +1100 |
| commit | 24942c8e5cc8696064ee207ff29d4cf21f70dafc (patch) | |
| tree | 08a8221eb72ec3da7746d7d76f6f5915ce77cde7 /Documentation/security | |
| parent | e163bc8e4a0cd1cdffadb58253f7651201722d56 (diff) | |
| parent | ff0ff78068dd8a962358dbbdafa9d6f24540d3e5 (diff) | |
| download | kernel_goldelico_gta04-24942c8e5cc8696064ee207ff29d4cf21f70dafc.zip kernel_goldelico_gta04-24942c8e5cc8696064ee207ff29d4cf21f70dafc.tar.gz kernel_goldelico_gta04-24942c8e5cc8696064ee207ff29d4cf21f70dafc.tar.bz2 | |
Merge branch 'master'; commit 'v3.2-rc2' into next
Diffstat (limited to 'Documentation/security')
| -rw-r--r-- | Documentation/security/keys-trusted-encrypted.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/security/keys-trusted-encrypted.txt b/Documentation/security/keys-trusted-encrypted.txt index 5f50cca..c9e4855 100644 --- a/Documentation/security/keys-trusted-encrypted.txt +++ b/Documentation/security/keys-trusted-encrypted.txt @@ -156,4 +156,5 @@ Load an encrypted key "evm" from saved blob: Other uses for trusted and encrypted keys, such as for disk and file encryption are anticipated. In particular the new format 'ecryptfs' has been defined in in order to use encrypted keys to mount an eCryptfs filesystem. More details -about the usage can be found in the file 'Documentation/keys-ecryptfs.txt'. +about the usage can be found in the file +'Documentation/security/keys-ecryptfs.txt'. |