Merge branch 'dev' into kernel
authorVyacheslav Cherkashin <v.cherkashin@samsung.com>
Wed, 29 May 2013 09:40:43 +0000 (13:40 +0400)
committerVyacheslav Cherkashin <v.cherkashin@samsung.com>
Wed, 29 May 2013 09:40:43 +0000 (13:40 +0400)
commita8a44b9a969008779405b59615d0b4dc57fba43b
tree6643e3775d483deb29b81efa422a1dd946be8926
parent0aafc07b033f5ffdcaea47c19bd040d444cd6371
parente6290d309c65cdd7d3fe0124397550cbd9a3cb51
Merge branch 'dev' into kernel

Conflicts:
src/modules/kprobe/arch/dbi_kprobes.c
driver/Makefile.am
kprobe/dbi_kprobes.c
kprobe/dbi_kprobes_deps.c
kprobe/dbi_kprobes_deps.h