Merge branch 'tizen_2.4' into tizen_2.4_dev 20/49920/2
authorAnatolii Nikulin <nikulin.a@samsung.com>
Wed, 21 Oct 2015 13:06:59 +0000 (16:06 +0300)
committerAnatolii Nikulin <nikulin.a@samsung.com>
Thu, 22 Oct 2015 09:52:43 +0000 (12:52 +0300)
commitaa05a5c8b30ac083dc3194df7ec4c3fee685cc8c
treef6b12959594ade8de024d27f749afb387586d09f
parentcea52cb0f329d21f39ee273c2644025a79e884ee
parenta9b70f94a251fc178513f492b2499b6f7dbf866f
Merge branch 'tizen_2.4' into tizen_2.4_dev

Change-Id: I9ca9dd85e7c85433c9f4f121f2ef68952cc722ab
Signed-off-by: Anatolii Nikulin <nikulin.a@samsung.com>
23 files changed:
fbiprobe/fbiprobe.c
preload/preload_control.c
preload/preload_module.c
preload/preload_probe.c
retprobe/retprobe.c
uprobe/arch/arm/swap-asm/swap_uprobes.c
uprobe/arch/arm/swap-asm/swap_uprobes.h
uprobe/arch/x86/swap-asm/swap_uprobes.c
uprobe/arch/x86/swap-asm/swap_uprobes.h
uprobe/swap_uprobes.c
uprobe/swap_uprobes.h
us_manager/helper.c
us_manager/img/img_file.c
us_manager/img/img_proc.c
us_manager/pf/pf_group.c
us_manager/pf/pf_group.h
us_manager/sspt/sspt.h
us_manager/sspt/sspt_file.c
us_manager/sspt/sspt_file.h
us_manager/sspt/sspt_page.c
us_manager/sspt/sspt_proc.c
us_manager/sspt/sspt_proc.h
wsp/wsp.c