Merge commit 'cc09f10e84d5' into kernel
authorVyacheslav Cherkashin <v.cherkashin@samsung.com>
Tue, 18 Jun 2013 08:56:27 +0000 (12:56 +0400)
committerVyacheslav Cherkashin <v.cherkashin@samsung.com>
Tue, 18 Jun 2013 10:53:42 +0000 (14:53 +0400)
commitfe8e3e24f2d76600407de3822248ab0faf85647c
tree69e22e792384fb685a246ada58feb85d60282e6b
parent49fb61dc2819d727d000e6aff6fe89964306f63b
parent9f9fc82513d5ed46d099615b1c1ce37bc5b437c5
Merge commit 'cc09f10e84d5' into kernel

Conflicts:
src/modules/kprobe/arch/asm-arm/dbi_kprobes.c
src/modules/kprobe/arch/asm-arm/dbi_kprobes_arm.h
src/modules/kprobe/arch/dbi_kprobes.h
src/modules/kprobe/dbi_kprobes.c
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
kprobe/dbi_kprobes.c