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)
commit3ffbcc24c8e1d9685ffb44d1e80742e588462873
treeae01a32db2223bf8f3ba3b253f3d3d88d1874017
parent945b7f064165c25c9d63fa75fbdabe5a940f894c
parent943dd337df47188d361c0f7f37c19184d73481eb
Merge: Added "chip_info" entry to the /proc/can/channelX, contributed by Sergei Sharonov.

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