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

projects / kernel / swap-modules.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b7acf01 785e689)

author	Vyacheslav Cherkashin <v.cherkashin@samsung.com>
	Tue, 6 Nov 2012 13:07:40 +0000 (17:07 +0400)
committer	Vyacheslav Cherkashin <v.cherkashin@samsung.com>
	Tue, 6 Nov 2012 13:07:40 +0000 (17:07 +0400)
commit	ce4aea2fe4de5714b604f450f4dca56afe5825bc
tree	5d87728fc34ba7ae635f6cfd8f1ab380a18cb07b	tree \| snapshot
parent	b7acf01976677998c5cb28dff67e2c77b395f077	commit \| diff
parent	785e68997711a3c0cf785dc1416f838c82a18574	commit \| diff

Merge branch 'dev' into new_dpf

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

driver/module.c	diff1 \|	diff2 \|	blob \| history
driver/storage.c	diff1 \|	diff2 \|	blob \| history
driver/storage.h	diff1 \|	diff2 \|	blob \| history
driver/us_proc_inst.c	diff1 \|	diff2 \|	blob \| history
kprobe/arch/asm-arm/dbi_kprobes.c	diff1 \|	diff2 \|	blob \| history

Domain: System / System Tools;