Merge branch 'dev' into kernel
authorVyacheslav Cherkashin <v.cherkashin@samsung.com>
Mon, 13 May 2013 09:50:06 +0000 (13:50 +0400)
committerVyacheslav Cherkashin <v.cherkashin@samsung.com>
Mon, 13 May 2013 09:50:52 +0000 (13:50 +0400)
commit5a7a7ce572c562f89c46e86c9cdebb851f559e1b
tree491a9392c1cf14375b62b5252dc9cb497ea4705f
parentb0c348b6cedf5c860f9c13d1d832103305fedab6
parentdf8d21ee72f16a099b7af9b8dc109ff4ab46b456
Merge branch 'dev' into kernel

Conflicts:
src/modules/kprobe/arch/asm-arm/dbi_kprobes.c
src/modules/kprobe/arch/asm-arm/dbi_kprobes_thumb.h
driver/us_proc_inst.c
uprobe/arch/asm-arm/swap_uprobes.c
uprobe/arch/asm-arm/swap_uprobes.h
uprobe/arch/asm-arm/trampoline_thumb.S
uprobe/arch/asm-arm/trampoline_thumb.h
uprobe/swap_uprobes.c