From: ppisa <pisa@cmp.felk.cvut.cz>
Date: Tue, 25 Oct 2005 15:59:00 +0000 (+0200)
Subject: Merge: Included support for PiMX1 board with SJA1000 on MX_DIS1 expansion board.
X-Git-Tag: CLT_COMM_CAN_usb_can1_kriz_bp~45
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/commitdiff_plain/4d76a7a1468e1c9ff7d7425fa830b7ba5e1e645d

Merge: Included support for PiMX1 board with SJA1000 on MX_DIS1 expansion board.

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

4d76a7a1468e1c9ff7d7425fa830b7ba5e1e645d