Merge branch 'dev' into new_dpf

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

diff --cc driver/module.c
Simple merge

diff --cc driver/storage.c
Simple merge

diff --cc driver/storage.h
index 624e464,937d5ed..19fbfac
--- 1/driver/storage.h
--- 2/driver/storage.h
+++ b/driver/storage.h
@@@ -176,10 -176,10 +176,10 @@@ typedef struc
  
  typedef struct
  {
-       //char *name;
+       char *name;
        char type;
        unsigned long size;
 -      signed char reg;        // -1 - memory, 0..127 - register number  
 +      signed char reg;        // -1 - memory, 0..127 - register number
        long off;
        struct list_head list;
  } us_proc_vtp_data_t;

diff --cc driver/us_proc_inst.c
Simple merge

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