Linus,
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs.git docs-move
for these changes:
commit d410fa4ef99112386de5f218dd7df7b4fca910b4
Author: Randy Dunlap <[email protected]>
Date: Thu May 19 15:59:38 2011 -0700
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>.
Documentation/00-INDEX | 6 ++----
Documentation/filesystems/nfs/idmapper.txt | 4 ++--
Documentation/networking/dns_resolver.txt | 4 ++--
Documentation/security/00-INDEX | 18 ++++++++++++++++++
Documentation/{ => security}/SELinux.txt | 0
Documentation/{ => security}/Smack.txt | 0
Documentation/{ => security}/apparmor.txt | 0
Documentation/{ => security}/credentials.txt | 2 +-
Documentation/{ => security}/keys-request-key.txt | 4 ++--
.../{ => security}/keys-trusted-encrypted.txt | 0
Documentation/{ => security}/keys.txt | 4 ++--
Documentation/{ => security}/tomoyo.txt | 0
MAINTAINERS | 6 +++---
include/linux/cred.h | 2 +-
include/linux/key.h | 2 +-
kernel/cred.c | 2 +-
scripts/selinux/README | 2 +-
security/apparmor/match.c | 2 +-
security/apparmor/policy_unpack.c | 4 ++--
security/keys/encrypted.c | 2 +-
security/keys/request_key.c | 2 +-
security/keys/request_key_auth.c | 2 +-
security/keys/trusted.c | 2 +-
23 files changed, 43 insertions(+), 27 deletions(-)
create mode 100644 Documentation/security/00-INDEX
rename Documentation/{ => security}/SELinux.txt (100%)
rename Documentation/{ => security}/Smack.txt (100%)
rename Documentation/{ => security}/apparmor.txt (100%)
rename Documentation/{ => security}/credentials.txt (99%)
rename Documentation/{ => security}/keys-request-key.txt (98%)
rename Documentation/{ => security}/keys-trusted-encrypted.txt (100%)
rename Documentation/{ => security}/keys.txt (99%)
rename Documentation/{ => security}/tomoyo.txt (100%)
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***