Merge commit 'c3b2c00db03530f8b928b959e085d5b9f6ce3264' into kernel
authorVyacheslav Cherkashin <v.cherkashin@samsung.com>
Wed, 8 May 2013 15:47:00 +0000 (19:47 +0400)
committerVyacheslav Cherkashin <v.cherkashin@samsung.com>
Wed, 8 May 2013 15:47:00 +0000 (19:47 +0400)
commitb0c348b6cedf5c860f9c13d1d832103305fedab6
tree477f320d0b78780b44f935a2d5c27239bbf2c65e
parentbbf1ec1f802a067ec2e492f0545e8d9d5c7f00e3
parentf80b896266bcc6fae51386206844dc407f3fd939
Merge commit 'c3b2c00db03530f8b928b959e085d5b9f6ce3264' into kernel

Conflicts:
src/modules/kprobe/dbi_uprobes.c
kprobe/arch/asm-x86/dbi_kprobes.c
uprobe/swap_uprobes.c