Merge branch 'linus' into cpus4096

Conflicts:

	drivers/acpi/processor_throttling.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 10 insertions, 0 deletions

diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug
index a7d24e692bab..2840ab69ef4e 100644
--- a/arch/powerpc/Kconfig.debug
+++ b/arch/powerpc/Kconfig.debug
@@ -57,6 +57,16 @@ config KGDB
           debugger.  See <http://kgdb.sourceforge.net/> for more information.
           Unless you are intending to debug the kernel, say N here.
 
+config CODE_PATCHING_SELFTEST
+        bool "Run self-tests of the code-patching code."
+        depends on DEBUG_KERNEL
+        default n
+
+config FTR_FIXUP_SELFTEST
+        bool "Run self-tests of the feature-fixup code."
+        depends on DEBUG_KERNEL
+        default n
+
 choice
         prompt "Serial Port"
         depends on KGDB