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

projects / kernel / swap-modules.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f3e0b8d cb4b163)

author	Vyacheslav Cherkashin <v.cherkashin@samsung.com>
	Thu, 18 Oct 2012 10:51:15 +0000 (14:51 +0400)
committer	Vyacheslav Cherkashin <v.cherkashin@samsung.com>
	Thu, 18 Oct 2012 10:51:15 +0000 (14:51 +0400)
commit	ce36b609f5cabd937ac255bf334fdcaeed62ab61
tree	941d21a4ddfe60421dd194a34cc7b49341d27625	tree \| snapshot
parent	f3e0b8d7d3cacef3dd8bf69abaa57c60676c634f	commit \| diff
parent	cb4b1637ba26faf2041d7f4e58c366c761477086	commit \| diff

Merge branch 'dev' into new_dpf

Conflicts:
src/modules/driver/us_proc_inst.c

driver/device_driver.c	diff1 \|	diff2 \|	blob \| history
driver/probes_manager.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
kprobe/dbi_uprobes.c	diff1 \|	diff2 \|	blob \| history

Domain: System / System Tools;