Merge branch 'tizen_2.4_dev' into tizen 69/70169/1
authorDmitry Kovalenko <d.kovalenko@samsung.com>
Wed, 18 May 2016 11:22:01 +0000 (14:22 +0300)
committerDmitry Kovalenko <d.kovalenko@samsung.com>
Wed, 18 May 2016 11:22:01 +0000 (14:22 +0300)
commit33418c424523a60a57683b0a5ea25e8fb45c8142
tree7747d120cc23bacf543b5c0c2d0451849ab0b41e
parentc610e9df77dac70624ded7cd37e444b1e4481dc0
parentd8f8ecd6f030ad95af29eb679219d148a0340c8a
Merge branch 'tizen_2.4_dev' into tizen

Change-Id: I2ca10946582bb778756f4e6a2fd265966839e805
energy/energy.c
kprobe/swap_kprobes.h