Prev: [ANNOUNCE] Git 126.96.36.199 (also 188.8.131.52 and 184.108.40.206)
Next: RAID/block regression starting from 2.6.32, bisected
From: Randy Dunlap on 28 Jul 2010 13:50
On Mon, 26 Jul 2010 19:57:48 -0700 John Johansen wrote:
> Signed-off-by: John Johansen <john.johansen(a)canonical.com>
> Documentation/kernel-parameters.txt | 12 ++++++++++--
> MAINTAINERS | 8 ++++++++
> 2 files changed, 18 insertions(+), 2 deletions(-)
> diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
> index 4ddb58d..b61f89f 100644
> --- a/Documentation/kernel-parameters.txt
> +++ b/Documentation/kernel-parameters.txt
> @@ -93,6 +93,7 @@ parameter is applicable:
> 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.
> @@ -254,8 +255,8 @@ and is between 256 and 4096 characters. It is defined in the file
> control method, with respect to putting devices into
> low power states, to be enforced (the ACPI 2.0 ordering
> of _PTS is used by default).
> - s4_nonvs prevents the kernel from saving/restoring the
> - ACPI NVS memory during hibernation.
> + nonvs prevents the kernel from saving/restoring the
> + ACPI NVS memory during suspend/hibernation and resume.
> sci_force_enable causes the kernel to set SCI_EN directly
> on resume from S1/S3 (which is against the ACPI spec,
> but some broken systems don't work without it).
Is that piece supposed to be part of this patch set?
*** Remember to use Documentation/SubmitChecklist when testing your code ***
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/