projects / kernel / swap-modules.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9a12def c5cba70)
Merge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev
authorVyacheslav Cherkashin <v.cherkashin@samsung.com>
Thu, 18 Oct 2012 08:29:12 +0000 (12:29 +0400)
committerVyacheslav Cherkashin <v.cherkashin@samsung.com>
Thu, 18 Oct 2012 08:29:12 +0000 (12:29 +0400)
Conflicts:
src/modules/driver/us_proc_inst.c

1  2 
driver/us_proc_inst.c patch | diff1 | diff2 | blob | history

diff --cc driver/us_proc_inst.c
Simple merge
Domain: System / System Tools;