Merge branch 'dev' into kernel
authorVyacheslav Cherkashin <v.cherkashin@samsung.com>
Tue, 4 Jun 2013 14:16:40 +0000 (18:16 +0400)
committerVyacheslav Cherkashin <v.cherkashin@samsung.com>
Tue, 4 Jun 2013 14:16:40 +0000 (18:16 +0400)
commit8111d6f8e534bc14d13fc0c14081f2be3c16698a
tree8d002e28aeb726d73bf741ed1f496a95996d598f
parent8f0954ad507c33499b45696f56c9b287bec259a2
parent7ec626feb870b8a1cc6cd97c4c700b74ace6a810
Merge branch 'dev' into kernel

Conflicts:
src/modules/driver/us_proc_inst.c
us_manager/helper.c
us_manager/helper.h
us_manager/us_manager.c