Ingo Molnar eadb8a091b 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>

2009-06-17 12:56:49 +02:00

..

hw_breakpoint

hw-breakpoints: sample HW breakpoint over kernel data address

2009-06-02 22:47:00 +02:00

kobject

samples: mark {static|__init|__exit} for {init|exit} functions

2009-01-06 15:59:12 -08:00

kprobes

Kprobes: move kprobe examples to samples/

2008-03-04 16:35:11 -08:00

markers

samples: mark {static|__init|__exit} for {init|exit} functions

2009-01-06 15:59:12 -08:00

trace_events

tracing: update sample with TRACE_INCLUDE_FILE

2009-05-06 23:10:42 -04:00

tracepoints

tracing: Documentation / sample code fixes for tracepoints

2009-03-24 22:32:12 +01:00

Kconfig

Merge branch 'linus' into tracing/hw-breakpoints

2009-06-17 12:56:49 +02:00

Makefile

hw-breakpoints: sample HW breakpoint over kernel data address

2009-06-02 22:47:00 +02:00