Merge branch 'dev' into new_dpf

diff --cc driver/device_driver.c
Simple merge

diff --cc driver/module.c
index e667a60,172e9e8..a01c3e4
--- 1/driver/module.c
--- 2/driver/module.c
+++ b/driver/module.c
@@@ -62,16 -62,8 +62,12 @@@ void __put_task_struct(struct task_stru
  void (*flush_cache_page) (struct vm_area_struct * vma, unsigned long page);
  #endif
  
 +#include "../../tools/gpmu/probes/entry_data.h"
 +
 +storage_arg_t sa_dpf;
 +
  static int __init InitializeModule(void)
  {
-       if(lookup_name == NULL) {
-               EPRINTF("fp_kallsyms_lookup_name parameter undefined!");
-               return -1;
-       }
        if(device_name == NULL) {
                EPRINTF("Using default device name!");
                device_name = gl_szDefaultDeviceName;

diff --cc driver/probes_manager.c
Simple merge

diff --cc driver/storage.c
Simple merge

diff --cc driver/storage.h
Simple merge

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

diff --cc kprobe/dbi_kprobes_deps.c
Simple merge