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

diff --cc driver/driver_to_buffer.c
Simple merge

diff --cc ks_features/ks_features.c
Simple merge

diff --cc parser/swap_msg_parser.c
index 453d9f5,487da22..60fc0ac
--- 1/parser/swap_msg_parser.c
--- 2/parser/swap_msg_parser.c
+++ b/parser/swap_msg_parser.c
@@@ -32,10 -32,9 +32,10 @@@
  #include <linux/module.h>
  #include <linux/vmalloc.h>
  #include <linux/cpumask.h>
- #include <asm/uaccess.h>
+ #include <linux/uaccess.h>
  
  #include "parser_defs.h"
 +#include "us_inst.h"
  #include "msg_buf.h"
  #include "msg_cmd.h"
  #include "cpu_ctrl.h"

diff --cc writer/debugfs_writer.c
index b577bf7,a37cd40..0eb7100
--- 1/writer/debugfs_writer.c
--- 2/writer/debugfs_writer.c
+++ b/writer/debugfs_writer.c
@@@ -32,10 -32,10 +32,10 @@@
  #include <linux/debugfs.h>
  #include <linux/vmalloc.h>
  #include <linux/slab.h>
- #include <asm/uaccess.h>
+ #include <linux/uaccess.h>
  #include <master/swap_debugfs.h>
  #include <master/swap_initializer.h>
 -#include "swap_writer_module.h"
 +#include "swap_msg.h"
  #include "event_filter.h"