diff options
author | Ingo Molnar <mingo@elte.hu> | 2012-03-13 16:32:54 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2012-03-13 16:33:03 +0100 |
commit | ef15eda98217f5183f457e7a2de8b79555ef908b (patch) | |
tree | f8f22b48f7bb237c9aa6646175f3e17eeac4af0e /arch/x86/kernel/uprobes.c | |
parent | uprobes/core: Rename bkpt to swbp (diff) | |
parent | x86: Move is_ia32_task to asm/thread_info.h from asm/compat.h (diff) | |
download | linux-ef15eda98217f5183f457e7a2de8b79555ef908b.tar.xz linux-ef15eda98217f5183f457e7a2de8b79555ef908b.zip |
Merge branch 'x86/cleanups' into perf/uprobes
Merge reason: We want to merge a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/uprobes.c')
0 files changed, 0 insertions, 0 deletions