Merge: Updates to compile with 2.6.26 Linux kernel.
authorppisa <pisa@cmp.felk.cvut.cz>
Wed, 16 Jul 2008 22:50:00 +0000 (00:50 +0200)
committerppisa <pisa@cmp.felk.cvut.cz>
Wed, 16 Jul 2008 22:50:00 +0000 (00:50 +0200)
Merge commit 'remotes/sf-ocera-lincan/master'


Trivial merge