Merge branch 'perf/urgent' into perf/core, to pick up fixes
authorIngo Molnar <mingo@kernel.org>
Wed, 28 Jan 2015 14:42:56 +0000 (15:42 +0100)
committerIngo Molnar <mingo@kernel.org>
Wed, 28 Jan 2015 14:42:56 +0000 (15:42 +0100)
commitf10698ed6807dc41d021fb7baeb24f9bc4051837
treefe9229efe38ad31788843a7535bfc3feb89f79a7
parent86038c5ea81b519a8a1fcfcd5e4599aab0cdd119
parente742f3dc0886a92403d578e8ac771e5e33d06d08
Merge branch 'perf/urgent' into perf/core, to pick up fixes

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