Merge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev

author Alexander Aksenov <a.aksenov@samsung.com>

Tue, 6 Nov 2012 16:48:24 +0000 (20:48 +0400)

committer Alexander Aksenov <a.aksenov@samsung.com>

Tue, 6 Nov 2012 16:48:24 +0000 (20:48 +0400)
author Alexander Aksenov <a.aksenov@samsung.com>
Tue, 6 Nov 2012 16:48:24 +0000 (20:48 +0400)
committer Alexander Aksenov <a.aksenov@samsung.com>
Tue, 6 Nov 2012 16:48:24 +0000 (20:48 +0400)
diff --cc driver/storage.c
Simple merge
diff --cc driver/storage.h
Simple merge
diff --cc driver/us_proc_inst.c
Simple merge
author	Alexander Aksenov <a.aksenov@samsung.com>
	Tue, 6 Nov 2012 16:48:24 +0000 (20:48 +0400)
committer	Alexander Aksenov <a.aksenov@samsung.com>
	Tue, 6 Nov 2012 16:48:24 +0000 (20:48 +0400)
		1	2
driver/storage.c	patch \|	diff1 \|	diff2 \|	blob \| history
driver/storage.h	patch \|	diff1 \|	diff2 \|	blob \| history
driver/us_proc_inst.c	patch \|	diff1 \|	diff2 \|	blob \| history