Merge branch 'dev' into kernel
authorVyacheslav Cherkashin <v.cherkashin@samsung.com>
Wed, 15 May 2013 13:28:30 +0000 (17:28 +0400)
committerVyacheslav Cherkashin <v.cherkashin@samsung.com>
Wed, 15 May 2013 13:28:30 +0000 (17:28 +0400)
commit3d30225bb68f60d0f6d9374f60dc49afb80527a0
tree388452719f6444f72fd847b7440634fc484aa77a
parent6fc678427adbe48a94833ae8427244d5d51f4b97
parent896f407cfe23be1ad042511614de8fe5776d7971
Merge branch 'dev' into kernel

Conflicts:
src/modules/driver/sspt/sspt_procs.c