projects / kernel / swap-modules.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3703356 1dad75a)
Merge branch 'dev' into kernel
authorVyacheslav Cherkashin <v.cherkashin@samsung.com>
Wed, 3 Apr 2013 14:23:23 +0000 (18:23 +0400)
committerVyacheslav Cherkashin <v.cherkashin@samsung.com>
Wed, 3 Apr 2013 14:46:14 +0000 (18:46 +0400)
commitbf43815bc3e38d531506c1f92f6600f687e72187
tree684b731402060a85f5686e23911255b6a5b9c571tree | snapshot
parent3703356c2e1a84a53699245899d0036d81b4210dcommit | diff
parent1dad75a11348210af4b57ae6940c8fe7d9fe9bd7commit | diff
Merge branch 'dev' into kernel

Conflicts:
src/modules/kprobe/arch/asm-arm/dbi_kprobes.c

and fix src/modules/driver/us_proc_inst.c:1236
-ip->jprobe.kp.addr);
+ip->jprobe.up.kp.addr);
driver/storage.c diff1 | diff2 | blob | history
driver/us_proc_inst.c diff1 | diff2 | blob | history
Domain: System / System Tools;