Merge commit 'fee9d083f74f' into kernel
authorVyacheslav Cherkashin <v.cherkashin@samsung.com>
Tue, 20 Aug 2013 09:30:00 +0000 (13:30 +0400)
committerVyacheslav Cherkashin <v.cherkashin@samsung.com>
Tue, 20 Aug 2013 09:30:00 +0000 (13:30 +0400)
commit76fe9782caea49a8ea5b670b7957849905308ade
treee2a435d63ca43c658a88be52ede254e6993948a9
parente09991d5f833796b51e85161e16ef77fe5399019
parent7414f0f6c7d26cc2b3d7d7aa1a0e12a97f92f211
Merge commit 'fee9d083f74f' into kernel

Conflicts:
src/modules/driver/device_driver.c
src/modules/driver_old/storage.c