]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit225adf944dd9b0b86f3dafdd3445d9f855125e4a
tree73d90d6ef86893c89bb70e78a2b63295d531f371
parentbec6ece89a5f39fc1985edca3bfdebf3112df5fd
parentd20eb18435975f71b439d1be6fa2ae9946c3531d
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