Merge commit '47da1aa59eb36b55cda9138bec39942a14f051c4' into kernel
authorVyacheslav Cherkashin <v.cherkashin@samsung.com>
Tue, 30 Apr 2013 11:01:57 +0000 (15:01 +0400)
committerVyacheslav Cherkashin <v.cherkashin@samsung.com>
Tue, 30 Apr 2013 11:01:57 +0000 (15:01 +0400)
commitba85708b73aa2dd2d051348d6135718b2b32ace2
tree80ccd0a4850474d1fe695bd70a86cffcedadc7b5
parentf759c2f02574eadb2862497cb9970c0077192e3e
parent1bae125c330462fb58badcf2bccbc14b904ebb00
Merge commit '47da1aa59eb36b55cda9138bec39942a14f051c4' into kernel

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