summaryrefslogtreecommitdiffstats
path: root/kernel/trace
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-04-23 11:10:28 +0200
committerIngo Molnar <mingo@elte.hu>2010-04-23 11:10:30 +0200
commit70bce3ba77540ebe77b8c0e1ac38d281a23fbb5e (patch)
tree34b09a49228f0949ff49dce66a433b0dfd83a2dc /kernel/trace
parentperf: Fix perf probe build error (diff)
parentMerge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
downloadlinux-70bce3ba77540ebe77b8c0e1ac38d281a23fbb5e.tar.xz
linux-70bce3ba77540ebe77b8c0e1ac38d281a23fbb5e.zip
Merge branch 'linus' into perf/core
Merge reason: merge the latest fixes, update to latest -rc. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/trace')
0 files changed, 0 insertions, 0 deletions