Merge branch 'perf/urgent' into perf/core
authorIngo Molnar <mingo@kernel.org>
Wed, 19 Jun 2013 10:44:41 +0000 (12:44 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 19 Jun 2013 10:44:41 +0000 (12:44 +0200)
Merge in the latest fixes, to avoid conflicts with ongoing work.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
include/linux/perf_event.h
kernel/events/core.c

Simple merge
Simple merge