From: Miroslav Ondra <ondra@faster.cz>
Date: Thu, 3 Oct 2019 21:47:24 +0000 (+0200)
Subject: Merge test
X-Git-Url: http://git.graph-it.com/?a=commitdiff_plain;h=ec2cb99848f125fa2f2cadc464b93d52c6bab7f2;p=graphit%2Funipi-kernel.git

Merge test
---

ec2cb99848f125fa2f2cadc464b93d52c6bab7f2
diff --cc modules/unipi/src/unipi_common.h
index aa511bf,72039af..0a331d1
--- a/modules/unipi/src/unipi_common.h
+++ b/modules/unipi/src/unipi_common.h
@@@ -52,7 -52,7 +52,7 @@@
  #if NEURONSPI_SCHED_REQUIRED > 0
  	#include <uapi/linux/sched/types.h>
  #endif
- #define NEURONSPI_MAJOR_VERSIONSTRING "Version 1.32:2019:09:19"
 -#define NEURONSPI_MAJOR_VERSIONSTRING "Version 1.33:2019:09:26"
++#define NEURONSPI_MAJOR_VERSIONSTRING "Version 1.34:2019:10:03"
  
  #define NEURONSPI_MAX_DEVS				3
  #define NEURONSPI_MAX_UART				16