Merge branch 'docs-security' into docs-move

1 files changed, 43 insertions, 43 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index aa9bbd1c0e2b..ec947424f702 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2813,38 +2813,19 @@ F:	Documentation/gpio.txt
 F:      drivers/gpio/
 F:      include/linux/gpio*
 
+GRE DEMULTIPLEXER DRIVER
+M:      Dmitry Kozlov <xeb@mail.ru>
+L:      netdev@vger.kernel.org
+S:      Maintained
+F:      net/ipv4/gre.c
+F:      include/net/gre.h
+
 GRETH 10/100/1G Ethernet MAC device driver
 M:      Kristoffer Glembo <kristoffer@gaisler.com>
 L:      netdev@vger.kernel.org
 S:      Maintained
 F:      drivers/net/greth*
 
-HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
-M:      Frank Seidel <frank@f-seidel.de>
-L:      platform-driver-x86@vger.kernel.org
-W:      http://www.kernel.org/pub/linux/kernel/people/fseidel/hdaps/
-S:      Maintained
-F:      drivers/platform/x86/hdaps.c
-
-HWPOISON MEMORY FAILURE HANDLING
-M:      Andi Kleen <andi@firstfloor.org>
-L:      linux-mm@kvack.org
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6.git hwpoison
-S:      Maintained
-F:      mm/memory-failure.c
-F:      mm/hwpoison-inject.c
-
-HYPERVISOR VIRTUAL CONSOLE DRIVER
-L:      linuxppc-dev@lists.ozlabs.org
-S:      Odd Fixes
-F:      drivers/tty/hvc/
-
-iSCSI BOOT FIRMWARE TABLE (iBFT) DRIVER
-M:      Peter Jones <pjones@redhat.com>
-M:      Konrad Rzeszutek Wilk <konrad@kernel.org>
-S:      Maintained
-F:      drivers/firmware/iscsi_ibft*
-
 GSPCA FINEPIX SUBDRIVER
 M:      Frank Zago <frank@zago.net>
 L:      linux-media@vger.kernel.org
@@ -2895,6 +2876,26 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 S:      Maintained
 F:      drivers/media/video/gspca/
 
+HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
+M:      Frank Seidel <frank@f-seidel.de>
+L:      platform-driver-x86@vger.kernel.org
+W:      http://www.kernel.org/pub/linux/kernel/people/fseidel/hdaps/
+S:      Maintained
+F:      drivers/platform/x86/hdaps.c
+
+HWPOISON MEMORY FAILURE HANDLING
+M:      Andi Kleen <andi@firstfloor.org>
+L:      linux-mm@kvack.org
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6.git hwpoison
+S:      Maintained
+F:      mm/memory-failure.c
+F:      mm/hwpoison-inject.c
+
+HYPERVISOR VIRTUAL CONSOLE DRIVER
+L:      linuxppc-dev@lists.ozlabs.org
+S:      Odd Fixes
+F:      drivers/tty/hvc/
+
 HARDWARE MONITORING
 M:      Jean Delvare <khali@linux-fr.org>
 M:      Guenter Roeck <guenter.roeck@ericsson.com>
@@ -3478,6 +3479,12 @@ F:	Documentation/isapnp.txt
 F:      drivers/pnp/isapnp/
 F:      include/linux/isapnp.h
 
+iSCSI BOOT FIRMWARE TABLE (iBFT) DRIVER
+M:      Peter Jones <pjones@redhat.com>
+M:      Konrad Rzeszutek Wilk <konrad@kernel.org>
+S:      Maintained
+F:      drivers/firmware/iscsi_ibft*
+
 ISCSI
 M:      Mike Christie <michaelc@cs.wisc.edu>
 L:      open-iscsi@googlegroups.com
@@ -3698,7 +3705,7 @@ KEYS/KEYRINGS:
 M:      David Howells <dhowells@redhat.com>
 L:      keyrings@linux-nfs.org
 S:      Maintained
-F:      Documentation/keys.txt
+F:      Documentation/security/keys.txt
 F:      include/linux/key.h
 F:      include/linux/key-type.h
 F:      include/keys/
@@ -3710,7 +3717,7 @@ M:	Mimi Zohar <zohar@us.ibm.com>
 L:      linux-security-module@vger.kernel.org
 L:      keyrings@linux-nfs.org
 S:      Supported
-F:      Documentation/keys-trusted-encrypted.txt
+F:      Documentation/security/keys-trusted-encrypted.txt
 F:      include/keys/trusted-type.h
 F:      security/keys/trusted.c
 F:      security/keys/trusted.h
@@ -3721,7 +3728,7 @@ M:	David Safford <safford@watson.ibm.com>
 L:      linux-security-module@vger.kernel.org
 L:      keyrings@linux-nfs.org
 S:      Supported
-F:      Documentation/keys-trusted-encrypted.txt
+F:      Documentation/security/keys-trusted-encrypted.txt
 F:      include/keys/encrypted-type.h
 F:      security/keys/encrypted.c
 F:      security/keys/encrypted.h
@@ -4989,6 +4996,13 @@ F:	Documentation/pps/
 F:      drivers/pps/
 F:      include/linux/pps*.h
 
+PPTP DRIVER
+M:      Dmitry Kozlov <xeb@mail.ru>
+L:      netdev@vger.kernel.org
+S:      Maintained
+F:      drivers/net/pptp.c
+W:      http://sourceforge.net/projects/accel-pptp
+
 PREEMPTIBLE KERNEL
 M:      Robert Love <rml@tech9.net>
 L:      kpreempt-tech@lists.sourceforge.net
@@ -7024,20 +7038,6 @@ M:	"Maciej W. Rozycki" <macro@linux-mips.org>
 S:      Maintained
 F:      drivers/tty/serial/zs.*
 
-GRE DEMULTIPLEXER DRIVER
-M:      Dmitry Kozlov <xeb@mail.ru>
-L:      netdev@vger.kernel.org
-S:      Maintained
-F:      net/ipv4/gre.c
-F:      include/net/gre.h
-
-PPTP DRIVER
-M:      Dmitry Kozlov <xeb@mail.ru>
-L:      netdev@vger.kernel.org
-S:      Maintained
-F:      drivers/net/pptp.c
-W:      http://sourceforge.net/projects/accel-pptp
-
 THE REST
 M:      Linus Torvalds <torvalds@linux-foundation.org>
 L:      linux-kernel@vger.kernel.org