Merge branch 'linus' into perf/core
Thomas Gleixner [Mon, 28 Jun 2010 20:33:13 +0000 (22:33 +0200)]
Reason: Further changes conflict with upstream fixes

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1  2 
MAINTAINERS
Makefile
init/main.c
kernel/sched.c
kernel/trace/trace_event_perf.c
tools/perf/builtin-record.c
tools/perf/util/event.c
tools/perf/util/newt.c
tools/perf/util/session.c

diff --cc MAINTAINERS
Simple merge
diff --cc Makefile
Simple merge
diff --cc init/main.c
Simple merge
diff --cc kernel/sched.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge