git.stricted.de - GitHub/exynos8895/android_kernel_samsung

author	Thomas Gleixner <tglx@linutronix.de>
	Mon, 28 Jun 2010 20:33:13 +0000 (22:33 +0200)
committer	Thomas Gleixner <tglx@linutronix.de>
	Mon, 28 Jun 2010 20:33:24 +0000 (22:33 +0200)
commit	f384c954c9fe3d3c6fce5ae66b67f2ddd947d098
tree	a38541b8083a2304435e9a153d408bd7cd44116e	tree \| snapshot (tar.gz zip)
parent	9a15a07fe2175dc25cd928a354b3839f562ac8cc	commit \| diff
parent	5904b3b81d25166e5e39b9727645bb47937618e3	commit \| diff

Merge branch 'linus' into perf/core

Reason: Further changes conflict with upstream fixes

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

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
init/main.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_event_perf.c	diff1 \|	diff2 \|	blob \| history
tools/perf/builtin-record.c	diff1 \|	diff2 \|	blob \| history
tools/perf/util/event.c	diff1 \|	diff2 \|	blob \| history
tools/perf/util/newt.c	diff1 \|	diff2 \|	blob \| history
tools/perf/util/session.c	diff1 \|	diff2 \|	blob \| history

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
init/main.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_event_perf.c	diff1 \|	diff2 \|	blob \| history
tools/perf/builtin-record.c	diff1 \|	diff2 \|	blob \| history
tools/perf/util/event.c	diff1 \|	diff2 \|	blob \| history
tools/perf/util/newt.c	diff1 \|	diff2 \|	blob \| history
tools/perf/util/session.c	diff1 \|	diff2 \|	blob \| history