Merge branch 'linus' into tracing/hw-breakpoints

Conflicts:
	arch/x86/Kconfig
	arch/x86/kernel/traps.c
	arch/x86/power/cpu.c
	arch/x86/power/cpu_32.c
	kernel/Makefile

Semantic conflict:
	arch/x86/kernel/hw_breakpoint.c

Merge reason: Resolve the conflicts, move from put_cpu_no_sched() to
              put_cpu() in arch/x86/kernel/hw_breakpoint.c.

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

1 files changed, 2 insertions, 1 deletions

diff --git a/samples/Kconfig b/samples/Kconfig
index 8458516c693c..17d64ba7864c 100644
--- a/samples/Kconfig
+++ b/samples/Kconfig
@@ -26,7 +26,8 @@ config SAMPLE_TRACE_EVENTS
           This build trace event example modules.
 
 config SAMPLE_KOBJECT
-        tristate "Build kobject examples"
+        tristate "Build kobject examples -- loadable modules only"
+        depends on m
         help
           This config option will allow you to build a number of
           different kobject sample modules showing how to use kobjects,