Ingo Molnar 37bf06375c Merge tag 'v3.12-rc4' into sched/core ...

Merge Linux v3.12-rc4 to fix a conflict and also to refresh the tree
before applying more scheduler patches.

Conflicts:
	arch/avr32/include/asm/Kbuild

Signed-off-by: Ingo Molnar <mingo@kernel.org>

2013-10-09 12:36:13 +02:00

..

events

Merge tag 'v3.12-rc4' into sched/core

2013-10-09 12:36:13 +02:00

define_trace.h

tracing: Add DEFINE_EVENT_FN() macro

2013-06-20 22:24:32 -07:00

ftrace.h

tracing/perf: Avoid perf_trace_buf_*() in perf_trace_##call() when possible

2013-08-13 21:06:30 -04:00

syscall.h

tracing: Add missing syscall_metadata comment

2013-07-01 20:34:25 -04:00