Ingo Molnar 32673822e4 Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
Conflicts:
	include/linux/perf_event.h

Merge reason: pick up the latest jump-label enhancements, they are cooked ready.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2011-04-27 10:40:21 +02:00
..
2011-01-05 12:47:31 +01:00
2011-01-05 12:47:31 +01:00
2011-03-23 10:15:58 +01:00
2010-10-15 15:53:27 +02:00
2011-01-05 12:47:31 +01:00
2011-01-05 12:47:31 +01:00
2011-01-05 12:47:31 +01:00
2011-04-04 09:43:33 +02:00
2011-04-04 13:43:16 -04:00
2011-01-05 12:47:31 +01:00
2011-04-04 13:43:16 -04:00
2010-10-07 14:08:55 +01:00
2011-01-12 09:55:25 +01:00
2011-01-05 12:47:31 +01:00
2011-03-31 11:26:23 -03:00
2010-03-08 16:55:37 +01:00
2011-03-31 11:26:23 -03:00
2011-01-05 12:47:31 +01:00
2011-01-05 12:47:31 +01:00
2011-03-23 10:15:58 +01:00
2011-03-31 11:26:23 -03:00
2011-02-15 07:34:16 -08:00
2011-03-31 11:26:23 -03:00