Merge branch 'dev' into kernel
authorVyacheslav Cherkashin <v.cherkashin@samsung.com>
Mon, 8 Apr 2013 05:47:47 +0000 (09:47 +0400)
committerVyacheslav Cherkashin <v.cherkashin@samsung.com>
Mon, 8 Apr 2013 05:47:47 +0000 (09:47 +0400)
commitdfddf7159b8490654d08a19da71c354dea471cf6
tree80eb23fe05bfa6cc97e914b79424cc19a7f43783
parent36356cfd4b61dea01c5107666ded9567530ba8b8
parentb63ff67e06b449e5b17027d8bc5029e37d9ce3f2
Merge branch 'dev' into kernel

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