projects / kernel / swap-modules.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 38fcd04 836b361)
Merge commit '1aad3093d6' into kernel
authorVyacheslav Cherkashin <v.cherkashin@samsung.com>
Tue, 20 Aug 2013 07:24:47 +0000 (11:24 +0400)
committerVyacheslav Cherkashin <v.cherkashin@samsung.com>
Tue, 20 Aug 2013 07:24:47 +0000 (11:24 +0400)
Conflicts:
src/modules/kprobe/dbi_uprobes.c


Trivial merge
Domain: System / System Tools;