Merge commit 'e27784e31bd662313ac83c1632a70b51e5d86563' into kernel
authorVyacheslav Cherkashin <v.cherkashin@samsung.com>
Tue, 30 Apr 2013 10:54:11 +0000 (14:54 +0400)
committerVyacheslav Cherkashin <v.cherkashin@samsung.com>
Tue, 30 Apr 2013 10:54:11 +0000 (14:54 +0400)
commitf759c2f02574eadb2862497cb9970c0077192e3e
treee4f3aa98029c6f1de211d5bdceb8398ec18f817b
parent4d6189a14602eae5124c06ad6bd946a767cd7657
parentc3aaa2488bd650e0396accc84e75c1f4de913f97
Merge commit 'e27784e31bd662313ac83c1632a70b51e5d86563' into kernel

Conflicts:
src/modules/kprobe/arch/asm-arm/dbi_kprobes.c
src/modules/kprobe/arch/asm-arm/dbi_kprobes.h
src/modules/kprobe/arch/dbi_kprobes.h
kprobe/arch/asm-arm/dbi_kprobes.c
kprobe/arch/asm-arm/dbi_kprobes.h
kprobe/arch/asm-x86/dbi_kprobes.c
kprobe/arch/asm-x86/dbi_kprobes.h
kprobe/dbi_kprobes.c
kprobe/dbi_kprobes.h