Merge branch 'master' into can-usb1
authorPavel Pisa <pisa@cmp.felk.cvut.cz>
Sat, 1 Oct 2011 18:08:22 +0000 (20:08 +0200)
committerPavel Pisa <pisa@cmp.felk.cvut.cz>
Sat, 1 Oct 2011 18:08:22 +0000 (20:08 +0200)
commit50e9e47fc21191ea9ea758fea1e7f2bd5a275e98
treebf85972b116ad51d112e816c34bf47ca8a8115af
parent3810959545bb02dd92e5ad90531af62e3c985da6
parent04ac67cc3cac14cd601daacd0592121ec0b84012
Merge branch 'master' into can-usb1
lincan/include/main.h
lincan/src/close.c
lincan/src/finish.c
lincan/src/hcan2.c
lincan/src/open.c
lincan/src/usbcan.c