]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
Merge branch 'linus' into perf/core
authorIngo Molnar <mingo@elte.hu>
Mon, 7 Feb 2011 07:44:11 +0000 (08:44 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 7 Feb 2011 07:44:26 +0000 (08:44 +0100)
Merge reason: Pick up perf fixes that are now upstream

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
kernel/perf_event.c
tools/perf/util/evsel.c

Simple merge
Simple merge