Merge branch 'perf/urgent' into perf/core

Browse source

Merge in two hw_breakpoint fixes, before applying another 5.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

...

This commit is contained in:

Ingo Molnar 2013-06-20 17:57:08 +02:00

parent f9134f36ae c790b0ad23

commit f070a4dba9

2 changed files with 13 additions and 7 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

14

arch/x86/kernel/kprobes/core.c

View file

6

kernel/events/hw_breakpoint.c

View file