projects / kernel / swap-modules.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6fc6784 896f407)
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)
Conflicts:
src/modules/driver/sspt/sspt_procs.c


Trivial merge
Domain: System / System Tools;