Merge branch 'tizen_2.4_dev' into tizen

Change-Id: Ia6a12395c6f82ee2131de1edf9d3e8990238f0f5

diff --cc energy/energy.c
Simple merge

diff --cc fbiprobe/fbiprobe.c
Simple merge

diff --cc kprobe/swap_kprobes.h
Simple merge

diff --cc kprobe/swap_kprobes_deps.h
Simple merge

diff --cc loader/loader_pd.c
Simple merge

diff --cc packaging/swap-modules.spec
Simple merge

diff --cc preload/preload_control.c
Simple merge

diff --cc us_manager/sspt/sspt_proc.c
Simple merge

diff --cc webprobe/webprobe.c
Simple merge