Ingo Molnar 548b841669 Merge commit 'v2.6.34-rc1' into perf/urgent ... Conflicts: tools/perf/util/probe-event.c Merge reason: Pick up -rc1 and resolve the conflict as well. Signed-off-by: Ingo Molnar <mingo@elte.hu>		2010-03-09 17:11:53 +01:00
..
hw_breakpoint	percpu: Add __percpu sparse annotations to hw_breakpoint	2010-02-27 16:23:39 +01:00
kobject	Driver core: Constify struct sysfs_ops in struct kobj_type	2010-03-07 17:04:49 -08:00
kprobes	sparc64: cheaper asm/uaccess.h inclusion	2009-08-16 18:25:53 -07:00
trace_events	debugfs: Change debuhgfs directory of trace-events-sample.h	2009-09-15 09:50:48 -07:00
tracepoints	const: constify remaining file_operations	2009-10-01 16:11:11 -07:00
Kconfig	Merge branch 'for-next' into for-linus	2009-12-07 18:36:35 +01:00
Makefile	Merge commit 'perf/core' into perf/hw-breakpoint	2009-10-18 01:12:33 +02:00