Merge branch 'x86/jumplabel' into perf/core
authorIngo Molnar <mingo@kernel.org>
Fri, 19 Jul 2013 07:55:00 +0000 (09:55 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 19 Jul 2013 07:55:00 +0000 (09:55 +0200)
Upcoming kprobes patches rely on the int3 code-patching machinery introduced by:

   fd4363fff3d9 x86: Introduce int3 (breakpoint)-based instruction patching

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

Trivial merge