A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-28 02:32:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'linus' into tracing/hw-breakpoints

Browse source 
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 <[email protected]>
This commit is contained in:
Ingo Molnar 2009-06-17 12:52:15 +02:00
commit eadb8a091b
5979 changed files with 498297 additions and 137651 deletions
Download patch file Download diff file Expand all files Collapse all files

3
samples/Kconfig
View file

@ -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,