Merge branch 'tizen_2.4' into tizen_2.4_dev 29/41229/1
authorDmitry Kovalenko <d.kovalenko@samsung.com>
Thu, 11 Jun 2015 17:02:05 +0000 (20:02 +0300)
committerDmitry Kovalenko <d.kovalenko@samsung.com>
Thu, 11 Jun 2015 17:02:05 +0000 (20:02 +0300)
commit81ef512944e7612e9d927d150f028443f4643ce2
tree25e318f0421f90a483a540b417dc68acd7f977e5
parent27f1310b9b48ac47fe464679560b21a00f5917b3
parentbad724f863491ce61c31c871030b783a9931d7da
Merge branch 'tizen_2.4' into tizen_2.4_dev

Signed-off-by: Dmitry Kovalenko <d.kovalenko@samsung.com>
Conflicts:
writer/kernel_operations.h
writer/kernel_operations_arm.c
writer/kernel_operations_x86.c
writer/swap_writer_module.c

Change-Id: I72f30a112b3f356e791296b3d6fe24e0e43005fa
driver/driver_to_buffer.c
ks_features/ks_features.c
parser/swap_msg_parser.c
writer/debugfs_writer.c