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

projects / kernel / swap-modules.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 45ab1d1 84efb9c)

author	Vyacheslav Cherkashin <v.cherkashin@samsung.com>
	Tue, 19 Mar 2013 17:58:20 +0000 (21:58 +0400)
committer	Vyacheslav Cherkashin <v.cherkashin@samsung.com>
	Tue, 19 Mar 2013 17:58:20 +0000 (21:58 +0400)
commit	37ef225006610ac9f0a8ebabc84701c9737ee16e
tree	edc30081e1d1b26e6edaae5fd50de8e2c2dd64c3	tree \| snapshot
parent	45ab1d1947eedde3035d9e0911a6444ca8b6eee3	commit \| diff
parent	84efb9c112b4a237e560c61babc3b93f32fc8f1b	commit \| diff

Merge branch 'dev' into kernel

Conflicts:
src/modules/kprobe/arch/asm-arm/dbi_kprobes.c

and 'Set flag of current mode' in:
src/modules/uprobe/arch/asm-arm/swap_uprobes.c

kprobe/arch/asm-arm/dbi_kprobes.c	diff1 \|	diff2 \|	blob \| history
uprobe/arch/asm-arm/swap_uprobes.c	diff1 \|	\|	blob \| history
uprobe/swap_uprobes.c	diff1 \|	diff2 \|	blob \| history

Domain: System / System Tools;