Merge: ns_dev_can.c added for FPGA version of C_CAN ARM device
authorppisa <pisa@cmp.felk.cvut.cz>
Thu, 2 Jun 2005 11:14:00 +0000 (13:14 +0200)
committerppisa <pisa@cmp.felk.cvut.cz>
Thu, 2 Jun 2005 11:14:00 +0000 (13:14 +0200)
Merge commit 'remotes/sf-ocera-lincan/master'


Trivial merge