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)
commitb4f9f2b64aa189c5584f266f4f0343af7a705441
treef410718bb93590ff61682b566c10f70d5883bbcd
parent76369139ceb955deefc509e6e12ce9d6ce50ccab
parent2c53b436a30867eb6b47dd7bab23ba638d1fb0d2
Merge commit 'v3.0-rc3' into perf/core

Merge reason: add the latest fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
include/linux/perf_event.h