]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
Merge branch 'perf/urgent' into perf/core
authorIngo Molnar <mingo@kernel.org>
Thu, 20 Jun 2013 15:57:08 +0000 (17:57 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 20 Jun 2013 15:57:40 +0000 (17:57 +0200)
Merge in two hw_breakpoint fixes, before applying another 5.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
kernel/events/hw_breakpoint.c

Simple merge