diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-13 14:49:51 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-13 14:49:51 +1100 |
| commit | d1c2a73399738a707cbccdbf2a565dad7b452c92 (patch) | |
| tree | 6fb221f123cd112b99ee870fe310e71c7c2bf372 /Documentation | |
| parent | 8f805382ba8205151c79ae236b1358fb41529e51 (diff) | |
| parent | dd8dbf2e6880e30c00b18600c962d0cb5a03c555 (diff) | |
Merge remote branch 'security-testing/next'
Conflicts:
Documentation/dontdiff
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/dontdiff | 3 | ||||
| -rw-r--r-- | Documentation/kernel-parameters.txt | 10 |
2 files changed, 3 insertions, 10 deletions
diff --git a/Documentation/dontdiff b/Documentation/dontdiff index 3c6699d9d719..d9bcffd59433 100644 --- a/Documentation/dontdiff +++ b/Documentation/dontdiff @@ -65,6 +65,7 @@ aicdb.h* asm-offsets.h asm_offsets.h autoconf.h* +av_permissions.h bbootsect bin2c binkernel.spec @@ -94,6 +95,7 @@ docproc elf2ecoff elfconfig.h* fixdep +flask.h fore200e_mkfirm fore200e_pca_fw.c* gconf @@ -101,6 +103,7 @@ gen-devlist gen_crc32table gen_init_cpio generated +genheaders genksyms *_gray256.c ihex2fw diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 04799e6adb45..f56ac54499c6 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 |