git.stricted.de - GitHub/LineageOS/G12/android_kernel_amlogic_linux-4.9.git/commit

projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9fc3af4 9fe6206)

author	Ingo Molnar <mingo@elte.hu>
	Mon, 2 Aug 2010 06:29:56 +0000 (08:29 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Mon, 2 Aug 2010 06:31:54 +0000 (08:31 +0200)
commit	3772b734720e1a3f2dc1d95cfdfaa5332f4ccf01
tree	a1a8cc85948c086aa12a1d8014151a7ca7c04ea8	tree \| snapshot (tar.gz zip)
parent	9fc3af467d0749989518a23f7289a6f44e5cb214	commit \| diff
parent	9fe6206f400646a2322096b56c59891d530e8d51	commit \| diff

Merge commit 'v2.6.35' into perf/core

Conflicts:
tools/perf/Makefile
tools/perf/util/hist.c

Merge reason: Resolve the conflicts and update to latest upstream.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/cpufreq.c	diff1 \|	diff2 \|	blob \| history
include/asm-generic/vmlinux.lds.h	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
scripts/package/Makefile	diff1 \|	diff2 \|	blob \| history
tools/perf/util/hist.c	diff1 \|	diff2 \|	blob \| history
tools/perf/util/symbol.c	diff1 \|	diff2 \|	blob \| history