summaryrefslogtreecommitdiffstats
path: root/fs/ecryptfs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-27 19:25:02 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-27 19:25:02 +0200
commite52e713ec30a31e9a4663d9aebbaae5ec07466a6 (patch)
tree68f9680577ae68f3972a5ed73afed5d1c2794310 /fs/ecryptfs
parentMerge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block (diff)
parentMerge branch 'docs-security' into docs-move (diff)
downloadlinux-e52e713ec30a31e9a4663d9aebbaae5ec07466a6.tar.xz
linux-e52e713ec30a31e9a4663d9aebbaae5ec07466a6.zip
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 'fs/ecryptfs')
0 files changed, 0 insertions, 0 deletions