Merge branch 'tizen_2.4_dev' into tizen

Change-Id: I2ca10946582bb778756f4e6a2fd265966839e805

diff --cc energy/energy.c
Simple merge

diff --cc kprobe/swap_kprobes.h
index 621a07c,9e5b429..c1609ec
--- 1/kprobe/swap_kprobes.h
--- 2/kprobe/swap_kprobes.h
+++ b/kprobe/swap_kprobes.h
@@@ -46,7 -46,14 +46,7 @@@
  #include <swap-asm/swap_kprobes.h>
  
  
- /* kprobe_status settings */
 -#ifdef CONFIG_ARM
 -
 -#define regs_return_value(regs)     ((regs)->ARM_r0)
 -
 -#endif
 -
 -
+ /* kp_core_status settings */
  /** Kprobe hit active */
  #define KPROBE_HIT_ACTIVE     0x00000001
  /** Kprobe hit ss */