Merge branch 'kernel' of 106.109.8.71:/srv/git/dbi into kernel
authorVyacheslav Cherkashin <v.cherkashin@samsung.com>
Sun, 14 Jul 2013 11:46:41 +0000 (15:46 +0400)
committerVyacheslav Cherkashin <v.cherkashin@samsung.com>
Sun, 14 Jul 2013 11:46:41 +0000 (15:46 +0400)
commit72ee773a19811adc85e96957cbdf893d76456838
tree822e4ec1b4949212247daaff10d5f91c7f86c3f8
parentddcb35afb8a6c745ba70995a9a4a9ed478173703
parent537b6563e011d918940ae7f28233a43e7ede425d
Merge branch 'kernel' of 106.109.8.71:/srv/git/dbi into kernel

Conflicts:
src/modules/writer/swap_writer_module.h
writer/swap_writer_module.c
writer/swap_writer_module.h