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)
commiteff2108f020f30eb90462205ecf3ce10a420938b
tree27d1fc8ab23cd81e4863c29cddc0fbe8cfe68431
parentafb71193a4d8e4a3c4c52a80a8cbee76582f0e90
parentf1a527899ef0a8a241eb3bea619eb2e29d797f44
Merge branch 'perf/urgent' into perf/core

Merge in the latest fixes, to avoid conflicts with ongoing work.

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