Ingo Molnar ec00010972 Merge branch 'perf/urgent' into perf/core, to resolve conflict and to prepare for new patches ... Conflicts: arch/x86/kernel/traps.c Signed-off-by: Ingo Molnar <mingo@kernel.org>		2014-06-06 07:55:06 +02:00
..
api	perf tools: Allow overriding sysfs and proc finding with env var	2014-06-03 21:34:29 +02:00
lockdep	Merge branch 'perf/urgent' into perf/core, to resolve conflict and to prepare for new patches	2014-06-06 07:55:06 +02:00
symbol	tools lib symbol: Start carving out symbol parsing routines from perf	2013-12-13 10:30:20 -03:00
traceevent	tools lib traceevent: Fix memory leak in pretty_print()	2014-04-23 13:19:30 +02:00