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

projects / kernel / swap-modules.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b2944eb 1f6771a)

author	Vyacheslav Cherkashin <v.cherkashin@samsung.com>
	Tue, 20 Aug 2013 10:16:10 +0000 (14:16 +0400)
committer	Vyacheslav Cherkashin <v.cherkashin@samsung.com>
	Tue, 20 Aug 2013 10:16:10 +0000 (14:16 +0400)
commit	eabd6c42f40b6069f1930eec48dd0fe02c2e70c8
tree	844181be65711b0ea89377bff804bae318bb092a	tree \| snapshot
parent	b2944eb809b1ad4d871b71f1b8e19d2aa807cddb	commit \| diff
parent	1f6771ade41edd7d2f7c9547672805d24b463f92	commit \| diff

Merge commit 'eae30cdf42' into kernel

Conflicts:
src/modules/driver/us_proc_inst.c
src/modules/kprobe/arch/asm-arm/dbi_kprobes.c
src/modules/kprobe/dbi_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 \|	\|	blob \| history

Domain: System / System Tools;