Merge: Changed kernel version to switch to new module parameters made consistent...
authorppisa <pisa@cmp.felk.cvut.cz>
Wed, 12 Jul 2006 16:52:00 +0000 (18:52 +0200)
committerppisa <pisa@cmp.felk.cvut.cz>
Wed, 12 Jul 2006 16:52:00 +0000 (18:52 +0200)
Merge commit 'remotes/sf-ocera-lincan/master'


Trivial merge