Merge commit '043dd5f812' into kernel
authorVyacheslav Cherkashin <v.cherkashin@samsung.com>
Tue, 20 Aug 2013 07:16:55 +0000 (11:16 +0400)
committerVyacheslav Cherkashin <v.cherkashin@samsung.com>
Tue, 20 Aug 2013 07:16:55 +0000 (11:16 +0400)
commit38fcd04b95c202e2fe19707767f4ed68cfb7ff2c
treee2a435d63ca43c658a88be52ede254e6993948a9
parent36d8941d71700b0494ce8e1c5f92dbb115ba723a
parente973a934a1bf8b7646ce510a07ea7850ba8a8cbe
Merge commit '043dd5f812' into kernel

Conflicts:
src/modules/kprobe/arch/asm-arm/dbi_kprobes.c
src/modules/kprobe/arch/asm-arm/dbi_kprobes_arm.h
kprobe/arch/asm-arm/dbi_kprobes.c
kprobe/arch/asm-arm/dbi_kprobes.h
kprobe/arch/asm-arm/trampoline_arm.S
kprobe/arch/asm-arm/trampoline_arm.h
uprobe/arch/asm-arm/swap_uprobes.c