projects / kernel / swap-modules.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 76fe978 5b77fe7)
Merge commit '35488dedf8d' into kernel
authorVyacheslav Cherkashin <v.cherkashin@samsung.com>
Tue, 20 Aug 2013 09:50:48 +0000 (13:50 +0400)
committerVyacheslav Cherkashin <v.cherkashin@samsung.com>
Tue, 20 Aug 2013 09:50:48 +0000 (13:50 +0400)
commit13b5c477ba8059a6173a98b57fdd8ea4a54c985d
tree6b7975a19890ef9f5eb27b3e5d770bb2298cbe86tree | snapshot
parent76fe9782caea49a8ea5b670b7957849905308adecommit | diff
parent5b77fe7292839be13605d51e8c6d2d887de70233commit | diff
Merge commit '35488dedf8d' into kernel

Conflicts:
src/modules/driver/probes_manager.c
src/modules/driver/probes_manager.h
src/modules/driver/us_proc_inst.c
src/modules/kprobe/dbi_kprobes.c
kprobe/dbi_kprobes.c diff1 | diff2 | blob | history
Domain: System / System Tools;