projects / platform / kernel / linux-exynos.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 83f0d53 60b341b)
Merge commit 'v2.6.33' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Fri, 26 Feb 2010 08:18:32 +0000 (09:18 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 26 Feb 2010 08:18:32 +0000 (09:18 +0100)
commit64b9fb5704a479d98a59f2a1d45d3331a8f847f8
tree2b1052b05fa7615c817894bc9802bc5bb2af7ac1tree | snapshot
parent83f0d53993b2967e54186468b0fc4321447f68f1commit | diff
parent60b341b778cc2929df16c0a504c91621b3c6a4adcommit | diff
Merge commit 'v2.6.33' into tracing/core

Conflicts:
scripts/recordmcount.pl

Merge reason: Merge up to v2.6.33.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/trace/ftrace.c diff1 | diff2 | blob | history
kernel/trace/trace.c diff1 | diff2 | blob | history
kernel/trace/trace_kprobe.c diff1 | diff2 | blob | history
scripts/recordmcount.pl diff1 | diff2 | blob | history
Domain: System / Kernel;