Merge branch 'perf/urgent' into perf/core
authorIngo Molnar <mingo@kernel.org>
Thu, 16 Jan 2014 08:33:30 +0000 (09:33 +0100)
committerIngo Molnar <mingo@kernel.org>
Thu, 16 Jan 2014 08:33:30 +0000 (09:33 +0100)
Pick up the latest fixes, refresh the development tree.

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

Simple merge
Simple merge