Merge branch 'master' into can-usb1
authorPavel Pisa <pisa@cmp.felk.cvut.cz>
Mon, 29 Mar 2010 08:54:24 +0000 (10:54 +0200)
committerPavel Pisa <pisa@cmp.felk.cvut.cz>
Mon, 29 Mar 2010 08:54:24 +0000 (10:54 +0200)
1  2 
lincan/include/can_sysdep.h
lincan/src/main.c

Simple merge
Simple merge