Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (30 commits)
  TOMOYO: Add recursive directory matching operator support.
  remove CONFIG_SECURITY_FILE_CAPABILITIES compile option
  SELinux: print denials for buggy kernel with unknown perms
  Silence the existing API for capability version compatibility check.
  LSM: Move security_path_chmod()/security_path_chown() to after mutex_lock().
  SELinux: header generation may hit infinite loop
  selinux: Fix warnings
  security: report the module name to security_module_request
  Config option to set a default LSM
  sysctl: require CAP_SYS_RAWIO to set mmap_min_addr
  tpm: autoload tpm_tis based on system PnP IDs
  tpm_tis: TPM_STS_DATA_EXPECT workaround
  define convenient securebits masks for prctl users (v2)
  tpm: fix header for modular build
  tomoyo: improve hash bucket dispersion
  tpm add default function definitions
  LSM: imbed ima calls in the security hooks
  SELinux: add .gitignore files for dynamic classes
  security: remove root_plug
  SELinux: fix locking issue introduced with c6d3aaa4e35c71a3
  ...

1 files changed, 0 insertions, 10 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 9107b387e91f..332fe3b47e0c 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -85,7 +85,6 @@ parameter is applicable:
         PPT     Parallel port support is enabled.
         PS2     Appropriate PS/2 support is enabled.
         RAM     RAM disk support is enabled.
-        ROOTPLUG The example Root Plug LSM is enabled.
         S390    S390 architecture is enabled.
         SCSI    Appropriate SCSI support is enabled.
                         A lot of drivers has their options described inside of
@@ -2164,15 +2163,6 @@ and is between 256 and 4096 characters. It is defined in the file
                         Useful for devices that are detected asynchronously
                         (e.g. USB and MMC devices).
 
-        root_plug.vendor_id=
-                        [ROOTPLUG] Override the default vendor ID
-
-        root_plug.product_id=
-                        [ROOTPLUG] Override the default product ID
-
-        root_plug.debug=
-                        [ROOTPLUG] Enable debugging output
-
         rw              [KNL] Mount root device read-write on boot
 
         S               [KNL] Run init in single mode