Merge branch 'docs-move' of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap...
Linus Torvalds [Fri, 27 May 2011 17:25:02 +0000 (10:25 -0700)]
* '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>.

1  2 
MAINTAINERS
include/linux/key.h
kernel/cred.c
security/keys/request_key.c
security/keys/request_key_auth.c

diff --cc MAINTAINERS
Simple merge
Simple merge
diff --cc kernel/cred.c
Simple merge
Simple merge
Simple merge