Merge branch 'dev' into new_dpf

diff --cc driver/device_driver.c
Simple merge

diff --cc driver/module.c
index 5600110,00e2472..e667a60
--- 1/driver/module.c
--- 2/driver/module.c
+++ b/driver/module.c
@@@ -69,13 -62,9 +62,13 @@@ 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(!fp_kallsyms_lookup_name) {
+       if(lookup_name == NULL) {
                EPRINTF("fp_kallsyms_lookup_name parameter undefined!");
                return -1;
        }

diff --cc driver/storage.c
Simple merge

diff --cc driver/storage.h
Simple merge