Merge commit '1b93c9c0d8b9' into kernel
authorVyacheslav Cherkashin <v.cherkashin@samsung.com>
Tue, 20 Aug 2013 09:58:37 +0000 (13:58 +0400)
committerVyacheslav Cherkashin <v.cherkashin@samsung.com>
Tue, 20 Aug 2013 09:58:37 +0000 (13:58 +0400)
commitb2944eb809b1ad4d871b71f1b8e19d2aa807cddb
tree76d000b34d617b3b5228f163408185262352b0d6
parent13b5c477ba8059a6173a98b57fdd8ea4a54c985d
parent69ce6b4c789bf0ee7cf526b354a3ac1d0f6a6524
Merge commit '1b93c9c0d8b9' into kernel

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