]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
Merge branch 'perf/urgent' into perf/core
authorIngo Molnar <mingo@elte.hu>
Wed, 16 Feb 2011 12:27:18 +0000 (13:27 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 16 Feb 2011 12:27:23 +0000 (13:27 +0100)
commitb00560f2d4de69bb12f66f9605985b516df98d77
tree0c92fc994125dc3ddb635842715be29d8b16808b
parentbf1af3a809506645b9130755b713b008da14737f
parent4fe757dd48a9e95e1a071291f15dda5421dacb66
Merge branch 'perf/urgent' into perf/core

Merge reason: we need to queue up dependent patch

Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/perf_event.c