Merge branch 'master' into can-usb1
authorPavel Pisa <pisa@cmp.felk.cvut.cz>
Sat, 1 Oct 2011 16:29:51 +0000 (18:29 +0200)
committerPavel Pisa <pisa@cmp.felk.cvut.cz>
Sat, 1 Oct 2011 16:29:51 +0000 (18:29 +0200)
1  2 
lincan/src/main.c

Simple merge