projects / kernel / swap-modules.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e09991d 7414f0f)
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)
Conflicts:
src/modules/driver/device_driver.c
src/modules/driver_old/storage.c


Trivial merge
Domain: System / System Tools;