Merge branch 'master' into can-usb1
authorppisa <pisa@cmp.felk.cvut.cz>
Sat, 1 Nov 2008 12:40:35 +0000 (13:40 +0100)
committerppisa <pisa@cmp.felk.cvut.cz>
Sat, 1 Nov 2008 12:40:35 +0000 (13:40 +0100)
commit831ccb1f14f7472962fc2d185f32e18105209bd7
treee40e19dd457b838a053337f5720e6322d144388f
parenta6d355f1cf48f39eecb2f1bdead51817d1fd5989
parentcd29136f5e7d59be1b9868691436df0fb54d1ecd
Merge branch 'master' into can-usb1

The changes between LinCAN 0.3.3 version and current master head are propagated
into "can-usb1" branch.

Conflicts:

lincan/include/kthread.h
lincan/include/main.h
lincan/src/Makefile.omk
lincan/src/bfadcan.c
lincan/src/boardlist.c
lincan/src/finish.c
lincan/src/kthread.c
lincan/src/main.c
lincan/src/modparms.c
lincan/src/proc.c
lincan/src/setup.c
lincan/include/can_sysdep.h
lincan/include/main.h
lincan/src/Makefile.omk
lincan/src/boardlist.c
lincan/src/main.c
lincan/src/modparms.c
lincan/src/proc.c
lincan/src/setup.c