Merge branch 'dev' into new_dpf
authorVyacheslav Cherkashin <v.cherkashin@samsung.com>
Thu, 8 Nov 2012 14:10:11 +0000 (18:10 +0400)
committerVyacheslav Cherkashin <v.cherkashin@samsung.com>
Thu, 8 Nov 2012 14:10:11 +0000 (18:10 +0400)
commitd6e53dc7caa4b88eba17a0c32335fa2fa903be92
tree464730eaf9e55bf17082e28ffdeea143e6685a66
parentce4aea2fe4de5714b604f450f4dca56afe5825bc
parent9843133e64ff888d02ff4a26a8f8bc9302616dd8
Merge branch 'dev' into new_dpf

Conflicts:
src/modules/driver/storage.h
src/modules/driver/us_proc_inst.c
driver/probes_manager.c
driver/storage.c
driver/storage.h
driver/us_proc_inst.c
driver/us_proc_inst.h