Merge commit 'v3.0-rc3' into perf/core
Ingo Molnar [Thu, 16 Jun 2011 11:23:15 +0000 (13:23 +0200)]
Merge reason: add the latest fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1  2 
include/linux/perf_event.h

Simple merge