Merge branch 'dev' into kernel
authorVyacheslav Cherkashin <v.cherkashin@samsung.com>
Fri, 12 Apr 2013 07:49:41 +0000 (11:49 +0400)
committerVyacheslav Cherkashin <v.cherkashin@samsung.com>
Fri, 12 Apr 2013 08:01:02 +0000 (12:01 +0400)
commit9563fbabaeda296b7d9ad6fb1a8af65f09012f11
tree57da9e6bc98b1b1b5a7585540d7155abd433adfc
parente8f474b5a4543acfb47c9f6534981c302ddeb419
parentd31fb7543225b0891035d5a633ee75887e828da0
Merge branch 'dev' into kernel

Conflicts:
src/modules/driver/probes_manager.c
src/modules/kprobe/arch/asm-arm/dbi_kprobes.c
src/modules/kprobe/dbi_insn_slots.c
src/modules/kprobe/dbi_kprobes.c
src/modules/kprobe/dbi_uprobes.c
driver/probes_manager.c
driver/sspt/sspt_debug.h
driver/sspt/sspt_file.c
driver/storage.c
driver/us_proc_inst.c
kprobe/arch/asm-arm/dbi_kprobes.c
kprobe/dbi_insn_slots.c
kprobe/dbi_kprobes.c
kprobe/dbi_kprobes_deps.c
kprobe/dbi_kprobes_deps.h
uprobe/swap_uprobes.c