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)
commited03d6357d08bae99cef8c4568114e72b8962415
tree081aace9b04d5cc78ddadc2a1aab950146c1ca75
parent9722ae7a46ccd6b394603f8e0925a71015ddedcd
parent2002cde374538230d31d799ee889c2b18f3cb33f
Merge: Eric Pennamen contributed support for NSI CAN PCI.

Merge commit 'remotes/sf-ocera-lincan/master'