Merge

diff --cc Makefile
index 89d99a2a3c1798d6b620450cd3a8193dbe2b26a2,89d99a2a3c1798d6b620450cd3a8193dbe2b26a2..97ee5271576ebd37f6ab5c06e1336e2dd4bfee7c
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -7,7 -7,7 +7,8 @@@ MODULES_LIST = unipi
  TRANSFER_MODULE = unipi/
  
  .PHONY: default
--default: symlink ;
++#default: symlink ;
++default: all ;
  
  all: 
        for m in ${MODULES_LIST}; do\

diff --cc modules/unipi/Makefile
index a545188b3388518199c839460060386d92a0258a,a545188b3388518199c839460060386d92a0258a..0f13fbc32ec4d9f279a09ea9c5e1d537a9bea79c
--- 1/modules/unipi/Makefile
--- 2/modules/unipi/Makefile
+++ b/modules/unipi/Makefile
@@@ -3,7 -3,7 +3,7 @@@
  # if necessary.
   
  SYMLINK_DIR_PATH = /run/kernel/neuron_spi
--LINUX_DIR_PATH = /root/linux/4_9_14/linux/
++LINUX_DIR_PATH = /root/bokula/linux/
  SRC_DIR_PATH = $(PWD)/src
  BIN_DIR_PATH = $(PWD)/bin
  
@@@ -44,7 -44,7 +44,7 @@@ unipi-objs := ${OBJ_FILES
  TARGET_PLC_PATH = tomunipi:
  
  .PHONY: default
--default: symlink ;
++default: all ;
  
  all: 
        make ARCH=arm CROSS_COMPILE=${CCPREFIX} -C ${LINUX_DIR_PATH} M=${PWD} modules

diff --cc version.txt
index bfd2790623f566cd221de61655842e5aac48d59a,6e4902bd120ed6396e4243d11522c4941f7c5992..0000000000000000000000000000000000000000
deleted file mode 100644,100644
--- 1/version.txt
--- 2/version.txt
+++ /dev/null
@@@ -1,1 -1,1 +1,0 @@@
- Repository:neuron-kernel ActiveBranch:[master] PrecedingRelease:v.0.10 PrecedingRevision:41(0329dbf) LatestCommit:Thu Jun 14 11:44:07 CEST 2018
 -Repository:neuron-kernel ActiveBranch:[master] PrecedingRelease:v.0.10 PrecedingRevision:42(0856d36) LatestCommit:Thu Jun 14 11:49:23 CEST 2018