projects / kernel / swap-modules.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f12595d 0af7bdc)
Merge branch 'nosmap' into dev
authorNikita Kalyazin <n.kalyazin@samsung.com>
Wed, 5 Dec 2012 07:13:27 +0000 (11:13 +0400)
committerNikita Kalyazin <n.kalyazin@samsung.com>
Wed, 5 Dec 2012 07:13:27 +0000 (11:13 +0400)
Conflicts:
src/dalvik_probes/Makefile
src/modules/dalvik_handlers/handlers.c

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

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