Merge branch 'master' into can-usb1

author Pavel Pisa <pisa@cmp.felk.cvut.cz>

Sat, 25 Jul 2015 21:14:55 +0000 (23:14 +0200)

committer Pavel Pisa <pisa@cmp.felk.cvut.cz>

Sat, 25 Jul 2015 21:14:55 +0000 (23:14 +0200)
author Pavel Pisa <pisa@cmp.felk.cvut.cz>
Sat, 25 Jul 2015 21:14:55 +0000 (23:14 +0200)
committer Pavel Pisa <pisa@cmp.felk.cvut.cz>
Sat, 25 Jul 2015 21:14:55 +0000 (23:14 +0200)
diff --cc lincan/include/can_sysdep.h
Simple merge
diff --cc lincan/include/main.h
Simple merge
diff --cc lincan/src/open.c
Simple merge
author	Pavel Pisa <pisa@cmp.felk.cvut.cz>
	Sat, 25 Jul 2015 21:14:55 +0000 (23:14 +0200)
committer	Pavel Pisa <pisa@cmp.felk.cvut.cz>
	Sat, 25 Jul 2015 21:14:55 +0000 (23:14 +0200)
		1	2
lincan/include/can_sysdep.h	patch \|	diff1 \|	diff2 \|	blob \| history
lincan/include/main.h	patch \|	diff1 \|	diff2 \|	blob \| history
lincan/src/open.c	patch \|	diff1 \|	diff2 \|	blob \| history