Ingo Molnar 10b0256496 Merge branch 'perf/kprobes' into perf/core
Conflicts:
	arch/x86/kernel/traps.c

The kprobes enhancements are fully cooked, ship them upstream.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
2014-06-05 12:26:50 +02:00
..
2014-03-13 15:32:44 -07:00
2011-07-01 10:37:14 +02:00
2014-01-03 14:37:13 +00:00
2012-03-28 18:11:12 +01:00
2014-04-28 09:27:34 +02:00