Merge: Added "chip_info" entry to the /proc/can/channelX, contributed by Sergei Sharonov.
authorppisa <pisa@cmp.felk.cvut.cz>
Sun, 26 Mar 2006 21:45:00 +0000 (23:45 +0200)
committerppisa <pisa@cmp.felk.cvut.cz>
Sun, 26 Mar 2006 21:45:00 +0000 (23:45 +0200)
Merge commit 'remotes/sf-ocera-lincan/master'


Trivial merge