AppArmor: update Maintainer and Documentation

Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: James Morris <jmorris@namei.org>

1 files changed, 8 insertions, 0 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 2b2407d9a6d0..b61f89fa01c1 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -93,6 +93,7 @@ parameter is applicable:
                         Documentation/scsi/.
         SECURITY Different security models are enabled.
         SELINUX SELinux support is enabled.
+        APPARMOR AppArmor support is enabled.
         SERIAL  Serial support is enabled.
         SH      SuperH architecture is enabled.
         SMP     The kernel is an SMP kernel.
@@ -2312,6 +2313,13 @@ and is between 256 and 4096 characters. It is defined in the file
                         If enabled at boot time, /selinux/disable can be used
                         later to disable prior to initial policy load.
 
+        apparmor=       [APPARMOR] Disable or enable AppArmor at boot time
+                        Format: { "0" | "1" }
+                        See security/apparmor/Kconfig help text
+                        0 -- disable.
+                        1 -- enable.
+                        Default value is set via kernel config option.
+
         serialnumber    [BUGS=X86-32]
 
         shapers=        [NET]