]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
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)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
include/linux/perf_event.h
kernel/events/core.c

Simple merge
Simple merge