]> git.baikalelectronics.ru Git - kernel.git/commit
Merge commit 'v2.6.39-rc7' into perf/core
authorIngo Molnar <mingo@elte.hu>
Tue, 10 May 2011 15:05:24 +0000 (17:05 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 10 May 2011 15:05:45 +0000 (17:05 +0200)
commita749e74b5f6d9614a3467abab9cb67ece2f1d4e8
tree11b1afac3a40d253cdb905c42901edfaae5e196e
parent98ff3d54fdb250fae112af8b934dc275b765778a
parent40399e765d95dbba5594bcab5166af9344ad9c3f
Merge commit 'v2.6.39-rc7' into perf/core

Merge reason: pull in the latest fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/cpu/perf_event_intel.c
kernel/trace/trace.c
tools/perf/Makefile