Merge branch 'dev' into kernel
authorVyacheslav Cherkashin <v.cherkashin@samsung.com>
Mon, 1 Apr 2013 11:40:34 +0000 (15:40 +0400)
committerVyacheslav Cherkashin <v.cherkashin@samsung.com>
Mon, 1 Apr 2013 11:40:34 +0000 (15:40 +0400)
commitf8e6073a1f4fd2635ada15141f5fa7f8e1364520
treeabb763b8f8b0ff162032514952a69a926c92aa37
parent4ce729d04ee41d4f6d64f01bae133e0384ae7571
parentd3de64cc6b0633aa6abff07db6139d3304f0dd21
Merge branch 'dev' into kernel

Conflicts:
src/daemon/swap_daemon_stop.sh
driver/us_proc_inst.c
kprobe/dbi_kprobes_deps.c