diff --git a/[refs] b/[refs] index d580d46086be..2c82851baad9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 09748e178b6cb8d3b8a748d0159aa7ad8eadcbe1 +refs/heads/master: 12d2b8f951063076c7e0acdff7ae1fecd54920a0 diff --git a/trunk/drivers/misc/Kconfig b/trunk/drivers/misc/Kconfig index 321eb9134635..f5ade1904aad 100644 --- a/trunk/drivers/misc/Kconfig +++ b/trunk/drivers/misc/Kconfig @@ -360,7 +360,7 @@ config THINKPAD_ACPI_VIDEO If you are not sure, say Y here. config THINKPAD_ACPI_HOTKEY_POLL - bool "Suport NVRAM polling for hot keys" + bool "Support NVRAM polling for hot keys" depends on THINKPAD_ACPI default y ---help--- diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig index bcbe06426fa6..43d6989c275f 100644 --- a/trunk/init/Kconfig +++ b/trunk/init/Kconfig @@ -486,7 +486,7 @@ config PID_NS default n depends on NAMESPACES && EXPERIMENTAL help - Suport process id namespaces. This allows having multiple + Support process id namespaces. This allows having multiple process with the same pid as long as they are in different pid namespaces. This is a building block of containers.