]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 051ed70 c406d96)
Merge commit 'v2.6.35' into perf/core
authorIngo Molnar <mingo@elte.hu>
Mon, 2 Aug 2010 06:29:56 +0000 (08:29 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 2 Aug 2010 06:31:54 +0000 (08:31 +0200)
commit88d316871b2262620afdfb07aa767d8f4a8ee546
treea1a8cc85948c086aa12a1d8014151a7ca7c04ea8tree | snapshot
parent051ed7008818d84a2297b3315f17c9aaf4f4b252commit | diff
parentc406d9686ef1d925c0eeb81c25acf2225c05c139commit | 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
Linux Kernel Source Tree.