review.tizen.org Git - kernel/swap-modules.git/commit

projects / kernel / swap-modules.git / commit

author	Dmitry Kovalenko <d.kovalenko@samsung.com>
	Thu, 30 Apr 2015 12:46:48 +0000 (15:46 +0300)
committer	Dmitry Kovalenko <d.kovalenko@samsung.com>
	Thu, 30 Apr 2015 12:46:48 +0000 (15:46 +0300)
commit	72c3a043112cba706e3681a065ac1dcde1782c9e
tree	0efde0eae141bfeae201ea304a006178341ae549	tree \| snapshot
parent	483630ae22b25b202c69d868592daf059f45ad10	commit \| diff
parent	fa9e1004f58dfde4a3a114b6c57bed3a584710e2	commit \| diff

Merge branch 'tizen_2.4' into tizen_2.4_dev

Signed-off-by: Dmitry Kovalenko <d.kovalenko@samsung.com>
Conflicts:
uprobe/swap_uprobes.c
us_manager/img/img_ip.c
us_manager/img/img_proc.h
us_manager/sspt/sspt.h
us_manager/sspt/sspt_debug.h
us_manager/sspt/sspt_file.c

Change-Id: Ic7e1d03f57ebf988cae51b004498460ba08aee45

25 files changed:

kprobe/arch/arm/swap-asm/swap_kprobes.h	diff1 \|	diff2 \|	blob \| history
kprobe/arch/x86/swap-asm/swap_kprobes.h	diff1 \|	diff2 \|	blob \| history
parser/msg_cmd.c	diff1 \|	diff2 \|	blob \| history
parser/msg_parser.c	diff1 \|	diff2 \|	blob \| history
parser/swap_msg_parser.c	diff1 \|	diff2 \|	blob \| history
parser/us_inst.c	diff1 \|	diff2 \|	blob \| history
uprobe/arch/arm/swap-asm/swap_uprobes.h	diff1 \|	diff2 \|	blob \| history
uprobe/arch/x86/swap-asm/swap_uprobes.c	diff1 \|	diff2 \|	blob \| history
uprobe/arch/x86/swap-asm/swap_uprobes.h	diff1 \|	diff2 \|	blob \| history
uprobe/swap_uprobes.c	diff1 \|	diff2 \|	blob \| history
uprobe/swap_uprobes.h	diff1 \|	diff2 \|	blob \| history
us_manager/img/img_file.c	diff1 \|	diff2 \|	blob \| history
us_manager/img/img_ip.c	diff1 \|	diff2 \|	blob \| history
us_manager/img/img_proc.c	diff1 \|	diff2 \|	blob \| history
us_manager/img/img_proc.h	diff1 \|	diff2 \|	blob \| history
us_manager/pf/pf_group.c	diff1 \|	diff2 \|	blob \| history
us_manager/sspt/ip.c	diff1 \|	diff2 \|	blob \| history
us_manager/sspt/sspt.h	diff1 \|	diff2 \|	blob \| history
us_manager/sspt/sspt_debug.h	diff1 \|	diff2 \|	blob \| history
us_manager/sspt/sspt_file.c	diff1 \|	diff2 \|	blob \| history
us_manager/sspt/sspt_file.h	diff1 \|	diff2 \|	blob \| history
us_manager/sspt/sspt_page.c	diff1 \|	diff2 \|	blob \| history
us_manager/sspt/sspt_proc.c	diff1 \|	diff2 \|	blob \| history
us_manager/sspt/sspt_proc.h	diff1 \|	diff2 \|	blob \| history
writer/swap_writer_module.c	diff1 \|	diff2 \|	blob \| history

Domain: System / System Tools;

RSS Atom

kprobe/arch/arm/swap-asm/swap_kprobes.h	diff1 \|	diff2 \|	blob \| history
kprobe/arch/x86/swap-asm/swap_kprobes.h	diff1 \|	diff2 \|	blob \| history
parser/msg_cmd.c	diff1 \|	diff2 \|	blob \| history
parser/msg_parser.c	diff1 \|	diff2 \|	blob \| history
parser/swap_msg_parser.c	diff1 \|	diff2 \|	blob \| history
parser/us_inst.c	diff1 \|	diff2 \|	blob \| history
uprobe/arch/arm/swap-asm/swap_uprobes.h	diff1 \|	diff2 \|	blob \| history
uprobe/arch/x86/swap-asm/swap_uprobes.c	diff1 \|	diff2 \|	blob \| history
uprobe/arch/x86/swap-asm/swap_uprobes.h	diff1 \|	diff2 \|	blob \| history
uprobe/swap_uprobes.c	diff1 \|	diff2 \|	blob \| history
uprobe/swap_uprobes.h	diff1 \|	diff2 \|	blob \| history
us_manager/img/img_file.c	diff1 \|	diff2 \|	blob \| history
us_manager/img/img_ip.c	diff1 \|	diff2 \|	blob \| history
us_manager/img/img_proc.c	diff1 \|	diff2 \|	blob \| history
us_manager/img/img_proc.h	diff1 \|	diff2 \|	blob \| history
us_manager/pf/pf_group.c	diff1 \|	diff2 \|	blob \| history
us_manager/sspt/ip.c	diff1 \|	diff2 \|	blob \| history
us_manager/sspt/sspt.h	diff1 \|	diff2 \|	blob \| history
us_manager/sspt/sspt_debug.h	diff1 \|	diff2 \|	blob \| history
us_manager/sspt/sspt_file.c	diff1 \|	diff2 \|	blob \| history
us_manager/sspt/sspt_file.h	diff1 \|	diff2 \|	blob \| history
us_manager/sspt/sspt_page.c	diff1 \|	diff2 \|	blob \| history
us_manager/sspt/sspt_proc.c	diff1 \|	diff2 \|	blob \| history
us_manager/sspt/sspt_proc.h	diff1 \|	diff2 \|	blob \| history
writer/swap_writer_module.c	diff1 \|	diff2 \|	blob \| history