projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: dcef788 93cfb3c)
Merge branch 'tracing/urgent' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Fri, 10 Apr 2009 10:46:28 +0000 (12:46 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 10 Apr 2009 10:46:51 +0000 (12:46 +0200)
commit1cad1252ed279ea59f3f8d3d3a5817eeb2f7a4d3
treeec5af7a70f58ad27ad21fc27815ca164ccf92c36tree | snapshot
parentdcef788eb9659b61a2110284fcce3ca6e63480d2commit | diff
parent93cfb3c9fd83d877a8f1ffad9ff862b617b32828commit | diff
Merge branch 'tracing/urgent' into tracing/core

Merge reason: pick up both v2.6.30-rc1 [which includes tracing/urgent fixes]
              and pick up the current lineup of tracing/urgent fixes as well

Signed-off-by: Ingo Molnar <mingo@elte.hu>
include/linux/ftrace.h diff1 | diff2 | blob | history
kernel/trace/trace.c diff1 | diff2 | blob | history
ep93xx device tree rework repo: git://git.maquefel.me/linux.git