Merge: Update of NSI CAN PCI kindly provided by Eric Pennamen pennamen AT gmail dot...
authorppisa <pisa@cmp.felk.cvut.cz>
Sun, 4 Jun 2006 21:59:00 +0000 (23:59 +0200)
committerppisa <pisa@cmp.felk.cvut.cz>
Sun, 4 Jun 2006 21:59:00 +0000 (23:59 +0200)
commit304f695647c226efecc50f1e0809c658b9a42a86
tree1371cfef8e394a023113f87c573e27f845409e1a
parentc433dcc19a2aa98ca9f29df8744873b788c1e853
parentf50d70ccd3426c6a317f0f9ccd10e3018b14631a
Merge: Update of NSI CAN PCI kindly provided by Eric Pennamen pennamen AT gmail dot com.

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