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

projects / kernel / swap-modules.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 8cb1323 f12595d)

author	Vyacheslav Cherkashin <v.cherkashin@samsung.com>
	Tue, 4 Dec 2012 17:34:06 +0000 (21:34 +0400)
committer	Vyacheslav Cherkashin <v.cherkashin@samsung.com>
	Tue, 4 Dec 2012 17:34:06 +0000 (21:34 +0400)
commit	aaa0c0811db8cebde3529cedc4dfc1f0958fd557
tree	8ac2ac903743930fec3964b8be7dcad18cf8e51b	tree \| snapshot
parent	8cb1323929fc2c68de4d28e1315da3c104089dcc	commit \| diff
parent	f12595daaa37de6e0f0a3e7ceabc303be6dd5a64	commit \| diff

Merge branch 'dev' into new_dpf

Conflicts:
src/modules/driver/device_driver.c
src/modules/driver/storage.c
src/modules/driver/us_proc_inst.c

driver/device_driver.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
driver/us_proc_inst.h	diff1 \|	diff2 \|	blob \| history
kprobe/arch/asm-arm/dbi_kprobes.c	diff1 \|	diff2 \|	blob \| history

Domain: System / System Tools;