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)
commit860fc2f2640ec348b9520ca4649b1bfd23d91bc2
tree73d90d6ef86893c89bb70e78a2b63295d531f371
parent197749981e539c1eb5863f417de6dd4e2c02b76c
parentbee09ed91cacdbffdbcd3b05de8409c77ec9fcd6
Merge branch 'perf/urgent' into perf/core

Pick up the latest fixes, refresh the development tree.

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