Merge commit '9cc656e464' into kernel
authorVyacheslav Cherkashin <v.cherkashin@samsung.com>
Tue, 18 Jun 2013 14:13:15 +0000 (18:13 +0400)
committerVyacheslav Cherkashin <v.cherkashin@samsung.com>
Tue, 18 Jun 2013 14:13:15 +0000 (18:13 +0400)
commitfa7e0342864d0f64c230a0962670ffed4ff83bf6
tree18acfc4f2bbeb29074edf09ac05897782a86c14d
parentffc8655debd168be1223ed5cfd5000edc65c8d7f
parent5b88714024588da6e81aa49ad7bc3bbde8f3767d
Merge commit '9cc656e464' into kernel

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