Merge branch 'tizen_2.4_dev' into tizen 62/70162/1
authorDmitry Kovalenko <d.kovalenko@samsung.com>
Tue, 17 May 2016 14:58:39 +0000 (17:58 +0300)
committerDmitry Kovalenko <d.kovalenko@samsung.com>
Tue, 17 May 2016 14:58:39 +0000 (17:58 +0300)
commitc610e9df77dac70624ded7cd37e444b1e4481dc0
treef8c762a041338b4c73a6697bca5d22f408568794
parent9d1c9079308b1d148bdf35a66d80c1632b367282
parent9359b8b8eec6ee8e3e5ca35c23896099f47147dd
Merge branch 'tizen_2.4_dev' into tizen

Change-Id: Ia6a12395c6f82ee2131de1edf9d3e8990238f0f5
energy/energy.c
fbiprobe/fbiprobe.c
kprobe/swap_kprobes.h
kprobe/swap_kprobes_deps.h
loader/loader_pd.c
packaging/swap-modules.spec
preload/preload_control.c
us_manager/sspt/sspt_proc.c
webprobe/webprobe.c