Merge branch 'master' into can-usb1
authorPavel Pisa <pisa@cmp.felk.cvut.cz>
Sat, 25 Jul 2015 21:14:55 +0000 (23:14 +0200)
committerPavel Pisa <pisa@cmp.felk.cvut.cz>
Sat, 25 Jul 2015 21:14:55 +0000 (23:14 +0200)
commit3c47a7cd435662f7e2daa006596722271f5dd090
treed4072b31537ca90ab4c66c4153da155f25399d90
parentb29ebe97fb5acced24e8ce9bb30e5d4dcad58815
parentd48f5ffafaa5a383c5fdfc7cdd83bb90d14a124c
Merge branch 'master' into can-usb1
lincan/include/can_sysdep.h
lincan/include/main.h
lincan/src/open.c