Merge branch 'dev' of ssh://106.109.8.71/srv/git/dbi into dev

diff --cc kprobe/arch/asm-arm/dbi_kprobes.c
Simple merge

diff --cc kprobe/arch/asm-arm/dbi_kprobes_thumb.S
Simple merge

diff --cc kprobe/arch/asm-arm/dbi_kprobes_thumb.h
index e7ebeff,39ac774..5b37c55
--- 1/kprobe/arch/asm-arm/dbi_kprobes_thumb.h
--- 2/kprobe/arch/asm-arm/dbi_kprobes_thumb.h
+++ b/kprobe/arch/asm-arm/dbi_kprobes_thumb.h
@@@ -1,7 -1,62 +1,67 @@@
+ /*
+  *  Kernel Probes (KProbes)
+  *  dbi_kprobes_thumb.h
+  *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation; either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+  *
+  * Copyright (C) IBM Corporation, 2002, 2004
+  */
+ 
+ /*
+  *  Dynamic Binary Instrumentation Module based on KProbes
+  *  modules/kprobes/arch/asm-arm/dbi_kprobes_thumb.h
+  *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation; either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+  *
+  * Copyright (C) Samsung Electronics, 2006-2013
+  *
+  * 2008-2009    Alexey Gerenkov <a.gerenkov@samsung.com> User-Space
+  *              Probes initial implementation; Support x86/ARM/MIPS for both 
+  *              user and kernel spaces.
+  * 2010         Ekaterina Gorelkina <e.gorelkina@samsung.com>: redesign module 
+  *              for separating core and arch parts
+  * 2010-2012    Dmitry Kovalenko <d.kovalenko@samsung.com>,
+  *              Nikita Kalyazin <n.kalyazin@samsung.com>
+  *              improvement and bugs fixing
+  * 2010-2011    Alexander Shirshikov
+  *              improvement and bugs fixing
+  * 2011-2012    Stanislav Andreev <s.andreev@samsung.com>
+  *              improvement and bugs fixing
+  * 2012         Vitaliy Cherepanov <v.chereapanov@samsung.com>
+  *              improvement and bugs fixing
+  * 2012-2013    Vasiliy Ulyanov <v.ulyanov@samsung.com>,
+  *              Vyacheslav Cherkashin <v.cherkashin@samsung.com>
+  *              improvement and bugs fixing
+  */
+ 
  void gen_insn_execbuf_thumb(void);
  void pc_dep_insn_execbuf_thumb(void);
 +void b_r_insn_execbuf_thumb(void);
 +void b_off_insn_execbuf_thumb(void);
 +void blx_off_insn_execbuf_thumb(void);
 +void b_cond_insn_execbuf_thumb(void);
 +void cbz_insn_execbuf_thumb(void);