Ingo Molnar ec5e61aabe Merge branch 'perf/urgent' into perf/core
Conflicts:
	arch/x86/kernel/cpu/perf_event.c

Merge reason: Resolve the conflict, pick up fixes

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2010-04-02 19:38:10 +02:00
..
2009-12-03 13:49:43 +01:00
2009-04-01 08:59:13 -07:00
2010-03-06 11:26:23 -08:00
2010-03-06 11:26:24 -08:00
2010-03-06 11:26:23 -08:00
2010-02-05 12:22:40 +01:00
2009-06-16 19:47:28 -07:00
2010-03-24 16:31:21 -07:00
2009-09-22 07:17:35 -07:00
2010-03-12 15:52:32 -08:00
2010-03-24 16:31:21 -07:00
2010-03-12 15:52:38 -08:00
2009-12-15 08:53:16 -08:00
2010-02-26 08:25:35 +01:00
2009-12-16 19:48:48 -05:00
2010-03-01 17:59:24 -08:00
2010-03-06 11:26:25 -08:00
2009-06-23 12:50:05 -07:00
2010-01-13 16:09:33 -08:00