Merge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev
authorVasiliy Ulyanov <v.ulyanov@samsung.com>
Wed, 13 Feb 2013 13:13:52 +0000 (17:13 +0400)
committerVasiliy Ulyanov <v.ulyanov@samsung.com>
Wed, 13 Feb 2013 13:13:52 +0000 (17:13 +0400)
commit12e62824cb1bd4e916acb7f845984fb28fcfc643
tree4018b266f87338ef6d8b61abe88581a122900a10
parent3c1a3fe6524bfe14b518f5ddeadb3e1c79f0b6f4
parent81b923d485daa187643fa091f3feedcadd66f2bc
Merge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev

Conflicts:
src/modules/driver/us_proc_inst.h
src/modules/kprobe/arch/dbi_kprobes.c
src/modules/kprobe/dbi_kprobes.c
driver/us_proc_inst.c
driver/us_proc_inst.h
kprobe/arch/asm-arm/dbi_kprobes.c
kprobe/arch/asm-x86/dbi_kprobes.c
kprobe/arch/dbi_kprobes.c
kprobe/dbi_kprobes.c
kprobe/dbi_kprobes.h
kprobe/dbi_kprobes_deps.c
kprobe/dbi_uprobes.c