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)
commit932fed4e2e42c3d730c01bb63b1c4f812c533d5b
tree11b1afac3a40d253cdb905c42901edfaae5e196e
parent57d524154ffe99d27fb55e0e30ddbad9f4c35806
parent693d92a1bbc9e42681c42ed190bd42b636ca876f
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