Merge branch 'linus' into perf/core
authorThomas Gleixner <tglx@linutronix.de>
Mon, 28 Jun 2010 20:33:13 +0000 (22:33 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Mon, 28 Jun 2010 20:33:24 +0000 (22:33 +0200)
commitf384c954c9fe3d3c6fce5ae66b67f2ddd947d098
treea38541b8083a2304435e9a153d408bd7cd44116e
parent9a15a07fe2175dc25cd928a354b3839f562ac8cc
parent5904b3b81d25166e5e39b9727645bb47937618e3
Merge branch 'linus' into perf/core

Reason: Further changes conflict with upstream fixes

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
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