Merge commit 'v3.0-rc3' into perf/core
authorIngo Molnar <mingo@elte.hu>
Thu, 16 Jun 2011 11:23:15 +0000 (13:23 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 16 Jun 2011 11:23:22 +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