Merge: Some minor updates to adapt sources for changes introduced in 2.6.15 kernel...
authorppisa <pisa@cmp.felk.cvut.cz>
Sat, 7 Jan 2006 21:09:00 +0000 (22:09 +0100)
committerppisa <pisa@cmp.felk.cvut.cz>
Sat, 7 Jan 2006 21:09:00 +0000 (22:09 +0100)
Merge commit 'remotes/sf-ocera-lincan/master'


Trivial merge