Merge branch 'master' into can-usb1
authorPavel Pisa <pisa@cmp.felk.cvut.cz>
Sat, 1 Oct 2011 15:43:17 +0000 (17:43 +0200)
committerPavel Pisa <pisa@cmp.felk.cvut.cz>
Sat, 1 Oct 2011 15:43:17 +0000 (17:43 +0200)
commitfe719367cdb25978d42261513dd9810c22481960
tree60530b8b9521a772dafdd49d8fe590e6070a4bb7
parentda0a5082dd75e429f78593e7bdec0fb87ae9e2a5
parent38b6fe757ff40daaf7b1b1474be5d3b7d3f0e2e3
Merge branch 'master' into can-usb1
lincan/include/can_sysdep.h
lincan/include/main.h
lincan/src/finish.c