diff --git a/[refs] b/[refs] index ff1f4a659ace..081a83df8f23 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f0a75770bde5cb5f9596bd0256d8ec3649720525 +refs/heads/master: 2944fcbe03d65a704f07e43efe14adb0d226fd09 diff --git a/trunk/kernel/trace/Kconfig b/trunk/kernel/trace/Kconfig index e71634604400..b416512ad17f 100644 --- a/trunk/kernel/trace/Kconfig +++ b/trunk/kernel/trace/Kconfig @@ -83,7 +83,7 @@ config RING_BUFFER_ALLOW_SWAP # This allows those options to appear when no other tracer is selected. But the # options do not appear when something else selects it. We need the two options # GENERIC_TRACER and TRACING to avoid circular dependencies to accomplish the -# hidding of the automatic options options. +# hidding of the automatic options. config TRACING bool