Merge: Eric Pennamen contributed support for NSI CAN PCI.
authorppisa <pisa@cmp.felk.cvut.cz>
Sun, 21 May 2006 18:27:00 +0000 (20:27 +0200)
committerppisa <pisa@cmp.felk.cvut.cz>
Sun, 21 May 2006 18:27:00 +0000 (20:27 +0200)
Merge commit 'remotes/sf-ocera-lincan/master'


Trivial merge